Mercurial > pidgin
diff pidgin/gtkdocklet.c @ 26624:4aa5400b1b99
Replace the deprecated GtkSignalFunc and GTK_SIGNAL_FUNC with GCallback and
G_CALLBACK. It shouldn't break API since they have the same signature, and
most of our code was already using the G_CALLBACK cast anyway (proving that
it doesn't cause any adverse effects).
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Sat, 18 Apr 2009 21:45:41 +0000 |
parents | 9ee0cb95a252 |
children | e304b1a0b516 82f26939d2ba |
line wrap: on
line diff
--- a/pidgin/gtkdocklet.c Sat Apr 18 07:31:32 2009 +0000 +++ b/pidgin/gtkdocklet.c Sat Apr 18 21:45:41 2009 +0000 @@ -482,7 +482,7 @@ } static GtkWidget * -new_menu_item_with_status_icon(GtkWidget *menu, const char *str, PurpleStatusPrimitive primitive, GtkSignalFunc sf, gpointer data, guint accel_key, guint accel_mods, char *mod) +new_menu_item_with_status_icon(GtkWidget *menu, const char *str, PurpleStatusPrimitive primitive, GCallback cb, gpointer data, guint accel_key, guint accel_mods, char *mod) { GtkWidget *menuitem; GdkPixbuf *pixbuf; @@ -493,8 +493,8 @@ if (menu) gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); - if (sf) - g_signal_connect(G_OBJECT(menuitem), "activate", sf, data); + if (cb) + g_signal_connect(G_OBJECT(menuitem), "activate", cb, data); pixbuf = pidgin_create_status_icon(primitive, menu, PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL); image = gtk_image_new_from_pixbuf(pixbuf);