diff options
author | Mike Kestner <mkestner@src.gnome.org> | 2002-11-01 05:30:57 +0800 |
---|---|---|
committer | Mike Kestner <mkestner@src.gnome.org> | 2002-11-01 05:30:57 +0800 |
commit | 613453b1095e325149b8d37e5731d415e1d5f9bd (patch) | |
tree | 1c0d7f9be4d4a87aa67d8e185ae2bb23d02254b7 /widgets/menus/gal-view-instance.c | |
parent | ec242d6c30d7bf056c8f59710b8576c942f93583 (diff) | |
download | gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.gz gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.zst gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.zip |
merging the gal-2 branch back to the trunk.
merging the gal-2 branch back to the trunk.
svn path=/trunk/; revision=18471
Diffstat (limited to 'widgets/menus/gal-view-instance.c')
-rw-r--r-- | widgets/menus/gal-view-instance.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/widgets/menus/gal-view-instance.c b/widgets/menus/gal-view-instance.c index 1cc0389f47..ebe823357f 100644 --- a/widgets/menus/gal-view-instance.c +++ b/widgets/menus/gal-view-instance.c @@ -27,8 +27,7 @@ #include <ctype.h> #include <string.h> #include <gtk/gtksignal.h> -#include <gnome-xml/parser.h> -#include <libgnome/gnome-defs.h> +#include <libxml/parser.h> #include <libgnome/gnome-util.h> #include <libgnomeui/gnome-dialog.h> #include <gal/util/e-util.h> @@ -230,7 +229,7 @@ gal_view_instance_init (GalViewInstance *instance) * gal_view_instance_get_type: * */ -guint +GtkType gal_view_instance_get_type (void) { static guint type = 0; @@ -505,7 +504,7 @@ view_item_cb (GtkWidget *widget, static void add_popup_radio_item (EPopupMenu *menu_item, gchar *title, - void (*fn) (GtkWidget *widget, gpointer closure), + GtkSignalFunc fn, gpointer closure, gboolean value) { @@ -522,7 +521,7 @@ add_popup_radio_item (EPopupMenu *menu_item, static void add_popup_menu_item (EPopupMenu *menu_item, gchar *title, - void (*fn) (GtkWidget *widget, gpointer closure), + GtkSignalFunc fn, gpointer closure) { const EPopupMenu menu_item_struct = |