Mercurial > pidgin.yaz
comparison pidgin/gtkdocklet.c @ 21269:68d6de0845f9
propagate from branch 'im.pidgin.charkins.dockletgeom' (head 0a163d30bd4e04f722543b3868eb2d934e5e1db8)
to branch 'im.pidgin.pidgin.next.minor' (head f286d10af3621cf62257f54718ae194d75be1916)
| author | Casey Harkins <charkins@pidgin.im> |
|---|---|
| date | Sun, 28 Oct 2007 17:16:42 +0000 |
| parents | d41c5443f443 8b9c48347004 |
| children | 6de09629f091 |
comparison
equal
deleted
inserted
replaced
| 20889:d41c5443f443 | 21269:68d6de0845f9 |
|---|---|
| 405 { | 405 { |
| 406 GtkWidget *menuitem; | 406 GtkWidget *menuitem; |
| 407 GdkPixbuf *pixbuf; | 407 GdkPixbuf *pixbuf; |
| 408 GtkWidget *image; | 408 GtkWidget *image; |
| 409 | 409 |
| 410 menuitem = gtk_image_menu_item_new_with_mnemonic(str); | 410 menuitem = gtk_image_menu_item_new_with_label(str); |
| 411 | 411 |
| 412 if (menu) | 412 if (menu) |
| 413 gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); | 413 gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); |
| 414 | 414 |
| 415 if (sf) | 415 if (sf) |
| 472 | 472 |
| 473 return menuitem; | 473 return menuitem; |
| 474 } | 474 } |
| 475 | 475 |
| 476 | 476 |
| 477 | |
| 477 static void | 478 static void |
| 478 plugin_act(GtkObject *obj, PurplePluginAction *pam) | 479 plugin_act(GtkObject *obj, PurplePluginAction *pam) |
| 479 { | 480 { |
| 480 if (pam && pam->callback) | 481 if (pam && pam->callback) |
| 481 pam->callback(pam); | 482 pam->callback(pam); |
| 550 c++; | 551 c++; |
| 551 } | 552 } |
| 552 if(c>0) | 553 if(c>0) |
| 553 pidgin_separator(menu); | 554 pidgin_separator(menu); |
| 554 } | 555 } |
| 555 | |
| 556 | 556 |
| 557 static void | 557 static void |
| 558 docklet_menu() { | 558 docklet_menu() { |
| 559 static GtkWidget *menu = NULL; | 559 static GtkWidget *menu = NULL; |
| 560 GtkWidget *menuitem; | 560 GtkWidget *menuitem; |