diff options
Diffstat (limited to 'nonprism/pidgin/nonprism.patch')
| -rw-r--r-- | nonprism/pidgin/nonprism.patch | 36 |
1 files changed, 7 insertions, 29 deletions
diff --git a/nonprism/pidgin/nonprism.patch b/nonprism/pidgin/nonprism.patch index d57c1ddd8..fd8bbdd8a 100644 --- a/nonprism/pidgin/nonprism.patch +++ b/nonprism/pidgin/nonprism.patch @@ -1,20 +1,21 @@ ---- pidgin-2.10.10.orig/pidgin/gtkutils.c 2014-10-16 22:19:33.000000000 -0200 -+++ pidgin-2.10.10/pidgin/gtkutils.c 2014-10-22 16:16:10.310955981 -0200 -@@ -677,7 +677,6 @@ +diff --git a/pidgin/gtkutils.c b/pidgin/gtkutils.c +index e5a3565b7..f5ca3d0eb 100644 +--- a/pidgin/gtkutils.c ++++ b/pidgin/gtkutils.c +@@ -677,7 +677,6 @@ create_protocols_menu(const char *default_proto_id) GdkPixbuf *pixbuf = NULL; GtkSizeGroup *sg; GList *p; -- const char *gtalk_name = NULL, *facebook_name = NULL; +- const char *gtalk_name = NULL; int i; aop_menu = g_malloc0(sizeof(AopMenu)); -@@ -686,63 +685,12 @@ +@@ -686,39 +685,12 @@ create_protocols_menu(const char *default_proto_id) gtk_widget_show(aop_menu->menu); sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); - if (purple_find_prpl("prpl-jabber")) { - gtalk_name = _("Google Talk"); -- facebook_name = _("Facebook (XMPP)"); - } - for (p = purple_plugins_get_protocols(), i = 0; @@ -46,29 +47,6 @@ - i++; - } - -- if (facebook_name && strcmp(facebook_name, plugin->info->name) < 0) { -- char *filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols", -- "16", "facebook.png", NULL); -- GtkWidget *item; -- -- pixbuf = pidgin_pixbuf_new_from_file(filename); -- g_free(filename); -- -- gtk_menu_shell_append(GTK_MENU_SHELL(aop_menu->menu), -- item = aop_menu_item_new(sg, pixbuf, facebook_name, "prpl-jabber", "protocol")); -- g_object_set_data(G_OBJECT(item), "fakefacebook", GINT_TO_POINTER(1)); -- -- if (pixbuf) -- g_object_unref(pixbuf); -- -- /* libpurple3 compatibility */ -- if (g_strcmp0(default_proto_id, "prpl-facebook-xmpp") == 0) -- aop_menu->default_item = i; -- -- facebook_name = NULL; -- i++; -- } -- pixbuf = pidgin_create_prpl_icon_from_prpl(plugin, PIDGIN_PRPL_ICON_SMALL, NULL); gtk_menu_shell_append(GTK_MENU_SHELL(aop_menu->menu), |