Mercurial > pidgin.yaz

comparison pidgin/gtkutils.c @ 26706:4aa5400b1b99

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 a3f7ade9e45b
children 0011cd06990a f3ccb5a36fd6
comparison
equal deleted inserted replaced
26705:a3f7ade9e45b 26706:4aa5400b1b99
356 pidgin_set_accessible_label (menuitem, label); 356 pidgin_set_accessible_label (menuitem, label);
357 return menuitem; 357 return menuitem;
358 } 358 }
359 359
360 GtkWidget *pidgin_new_check_item(GtkWidget *menu, const char *str, 360 GtkWidget *pidgin_new_check_item(GtkWidget *menu, const char *str,
361 GtkSignalFunc sf, gpointer data, gboolean checked) 361 GCallback cb, gpointer data, gboolean checked)
362 { 362 {
363 GtkWidget *menuitem; 363 GtkWidget *menuitem;
364 menuitem = gtk_check_menu_item_new_with_mnemonic(str); 364 menuitem = gtk_check_menu_item_new_with_mnemonic(str);
365 365
366 if (menu) 366 if (menu)
367 gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); 367 gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
368 368
369 gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), checked); 369 gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), checked);
370 370
371 if (sf) 371 if (cb)
372 g_signal_connect(G_OBJECT(menuitem), "activate", sf, data); 372 g_signal_connect(G_OBJECT(menuitem), "activate", cb, data);
373 373
374 gtk_widget_show_all(menuitem); 374 gtk_widget_show_all(menuitem);
375 375
376 return menuitem; 376 return menuitem;
377 } 377 }
437 437
438 return button; 438 return button;
439 } 439 }
440 440
441 441
442 GtkWidget *pidgin_new_item_from_stock(GtkWidget *menu, const char *str, const char *icon, GtkSignalFunc sf, gpointer data, guint accel_key, guint accel_mods, char *mod) 442 GtkWidget *pidgin_new_item_from_stock(GtkWidget *menu, const char *str, const char *icon, GCallback cb, gpointer data, guint accel_key, guint accel_mods, char *mod)
443 { 443 {
444 GtkWidget *menuitem; 444 GtkWidget *menuitem;
445 /* 445 /*
446 GtkWidget *hbox; 446 GtkWidget *hbox;
447 GtkWidget *label; 447 GtkWidget *label;
454 menuitem = gtk_image_menu_item_new_with_mnemonic(str); 454 menuitem = gtk_image_menu_item_new_with_mnemonic(str);
455 455
456 if (menu) 456 if (menu)
457 gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); 457 gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
458 458
459 if (sf) 459 if (cb)
460 g_signal_connect(G_OBJECT(menuitem), "activate", sf, data); 460 g_signal_connect(G_OBJECT(menuitem), "activate", cb, data);
461 461
462 if (icon != NULL) { 462 if (icon != NULL) {
463 image = gtk_image_new_from_stock(icon, gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL)); 463 image = gtk_image_new_from_stock(icon, gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL));
464 gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), image); 464 gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), image);
465 } 465 }