# HG changeset patch # User Sadrul Habib Chowdhury # Date 1192187957 0 # Node ID dc94a669bbf6fd24ac7681bc0b8e1eb2dba44c49 # Parent 39a793dcb9dfa943d762d617fa39ff94e669c55c# Parent c7b20abc38855196cf354e72d17d6b7a4452e158 merge of '0799c401a032f2fe66af5bbf14c1269fa11fe738' and 'fa0e512d79dfe479bc36c2436089b51854ef3eb5' diff -r c7b20abc3885 -r dc94a669bbf6 pidgin/gtkdocklet.c --- a/pidgin/gtkdocklet.c Fri Oct 12 02:33:31 2007 +0000 +++ b/pidgin/gtkdocklet.c Fri Oct 12 11:19:17 2007 +0000 @@ -407,7 +407,7 @@ GdkPixbuf *pixbuf; GtkWidget *image; - menuitem = gtk_image_menu_item_new_with_mnemonic(str); + menuitem = gtk_image_menu_item_new_with_label(str); if (menu) gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); @@ -474,6 +474,7 @@ } + static void plugin_act(GtkObject *obj, PurplePluginAction *pam) { @@ -553,7 +554,6 @@ pidgin_separator(menu); } - static void docklet_menu() { static GtkWidget *menu = NULL;