diff -u nautilus-2.20.0/debian/changelog nautilus-2.20.0/debian/changelog --- nautilus-2.20.0/debian/changelog +++ nautilus-2.20.0/debian/changelog @@ -1,3 +1,10 @@ +nautilus (1:2.20.0-0ubuntu8) gutsy; urgency=low + + * move the struct NautilusMenuItemDetails from nautilus-menu-item.c to + nautilus-menu.h for developers to be able to use it. (LP: #188288) + + -- Ouattara Oumar Aziz (alias wattazoum) Sat, 02 Feb 2008 10:14:40 +0100 + nautilus (1:2.20.0-0ubuntu7) gutsy; urgency=low * Drop debian/patches/12_vfat_no_free_space.patch again. It just causes more only in patch2: unchanged: --- nautilus-2.20.0.orig/libnautilus-extension/nautilus-menu-item.c +++ nautilus-2.20.0/libnautilus-extension/nautilus-menu-item.c @@ -43,16 +43,6 @@ LAST_PROP }; -struct _NautilusMenuItemDetails { - char *name; - char *label; - char *tip; - char *icon; - NautilusMenu *menu; - gboolean sensitive; - gboolean priority; -}; - static guint signals[LAST_SIGNAL]; static GObjectClass *parent_class = NULL; only in patch2: unchanged: --- nautilus-2.20.0.orig/libnautilus-extension/nautilus-menu.h +++ nautilus-2.20.0/libnautilus-extension/nautilus-menu.h @@ -69,6 +69,17 @@ }; /* NautilusMenuItem structs */ + +struct _NautilusMenuItemDetails { + char *name; + char *label; + char *tip; + char *icon; + NautilusMenu *menu; + gboolean sensitive; + gboolean priority; +}; + struct _NautilusMenuItem { GObject parent; @@ -81,7 +92,6 @@ void (*activate) (NautilusMenuItem *item); }; - /* NautilusMenu methods */ GType nautilus_menu_get_type (void); NautilusMenu * nautilus_menu_new (void); only in patch2: unchanged: --- nautilus-2.20.0.orig/debian/patches/92_nautilusMenuItemDetails_in_header.patch +++ nautilus-2.20.0/debian/patches/92_nautilusMenuItemDetails_in_header.patch @@ -0,0 +1,49 @@ +diff -Nurp nautilus-2.20.0-old/libnautilus-extension/nautilus-menu.h nautilus-2.20.0/libnautilus-extension/nautilus-menu.h +--- nautilus-2.20.0-old/libnautilus-extension/nautilus-menu.h 2008-02-02 09:08:25.000000000 +0100 ++++ nautilus-2.20.0/libnautilus-extension/nautilus-menu.h 2008-02-02 09:10:13.000000000 +0100 +@@ -69,6 +69,17 @@ struct _NautilusMenuClass { + }; + + /* NautilusMenuItem structs */ ++ ++struct _NautilusMenuItemDetails { ++ char *name; ++ char *label; ++ char *tip; ++ char *icon; ++ NautilusMenu *menu; ++ gboolean sensitive; ++ gboolean priority; ++}; ++ + struct _NautilusMenuItem { + GObject parent; + +@@ -81,7 +92,6 @@ struct _NautilusMenuItemClass { + void (*activate) (NautilusMenuItem *item); + }; + +- + /* NautilusMenu methods */ + GType nautilus_menu_get_type (void); + NautilusMenu * nautilus_menu_new (void); +diff -Nurp nautilus-2.20.0-old/libnautilus-extension/nautilus-menu-item.c nautilus-2.20.0/libnautilus-extension/nautilus-menu-item.c +--- nautilus-2.20.0-old/libnautilus-extension/nautilus-menu-item.c 2008-02-02 09:08:18.000000000 +0100 ++++ nautilus-2.20.0/libnautilus-extension/nautilus-menu-item.c 2008-02-02 09:09:24.000000000 +0100 +@@ -43,16 +43,6 @@ enum { + LAST_PROP + }; + +-struct _NautilusMenuItemDetails { +- char *name; +- char *label; +- char *tip; +- char *icon; +- NautilusMenu *menu; +- gboolean sensitive; +- gboolean priority; +-}; +- + static guint signals[LAST_SIGNAL]; + + static GObjectClass *parent_class = NULL;