diff options
Diffstat (limited to 'nonprism/pidgin/remove-services.patch')
| -rw-r--r-- | nonprism/pidgin/remove-services.patch | 160 |
1 files changed, 160 insertions, 0 deletions
diff --git a/nonprism/pidgin/remove-services.patch b/nonprism/pidgin/remove-services.patch new file mode 100644 index 000000000..f7e4e0264 --- /dev/null +++ b/nonprism/pidgin/remove-services.patch @@ -0,0 +1,160 @@ +diff --git a/pidgin/gtkutils.c b/pidgin/gtkutils.c +index 8ae28e1..7c94cbf 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; + int i; + + aop_menu = g_malloc0(sizeof(AopMenu)); +@@ -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"); +- } +- + for (p = purple_plugins_get_protocols(), i = 0; + p != NULL; + p = p->next, i++) { + + plugin = (PurplePlugin *)p->data; + +- if (gtalk_name && strcmp(gtalk_name, plugin->info->name) < 0) { +- char *filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols", +- "16", "google-talk.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, gtalk_name, "prpl-jabber", "protocol")); +- g_object_set_data(G_OBJECT(item), "fakegoogle", GINT_TO_POINTER(1)); +- +- if (pixbuf) +- g_object_unref(pixbuf); +- +- /* libpurple3 compatibility */ +- if (purple_strequal(default_proto_id, "prpl-gtalk")) +- aop_menu->default_item = i; +- +- gtalk_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), +diff --git a/pidgin/pixmaps/Makefile.am b/pidgin/pixmaps/Makefile.am +index 8c24469..77f8469 100644 +--- a/pidgin/pixmaps/Makefile.am ++++ b/pidgin/pixmaps/Makefile.am +@@ -89,7 +89,6 @@ DIALOGS_SCALABLE = \ + dialogs/scalable/warning.svg + + EMBLEMS_16 = \ +- emblems/16/aol-client.png \ + emblems/16/birthday.png \ + emblems/16/blocked.png \ + emblems/16/bot.png \ +@@ -110,7 +109,6 @@ EMBLEMS_16 = \ + emblems/16/voice.png + + EMBLEMS_SCALABLE = \ +- emblems/scalable/aol-client.svg \ + emblems/scalable/blocked.svg \ + emblems/scalable/bot.svg \ + emblems/scalable/external.svg \ +@@ -201,29 +199,17 @@ EMOTES_SMALL_16_SCALABLE = \ + emotes/small/16/scalable/pidgin-emotes.svg + + PROTOCOLS_16_SCALABLE = \ +- protocols/16/scalable/aim.svg \ + protocols/16/scalable/bonjour.svg \ +- protocols/16/scalable/gadu-gadu.svg \ +- protocols/16/scalable/novell.svg \ +- protocols/16/scalable/icq.svg \ + protocols/16/scalable/irc.svg \ + protocols/16/scalable/jabber.svg \ +- protocols/16/scalable/meanwhile.svg \ + protocols/16/scalable/silc.svg \ + protocols/16/scalable/simple.svg \ + protocols/16/scalable/zephyr.svg + + PROTOCOLS_16 = \ +- protocols/16/aim.png \ + protocols/16/bonjour.png \ +- protocols/16/facebook.png \ +- protocols/16/gadu-gadu.png \ +- protocols/16/google-talk.png \ +- protocols/16/novell.png \ +- protocols/16/icq.png \ + protocols/16/irc.png \ + protocols/16/jabber.png \ +- protocols/16/meanwhile.png \ + protocols/16/silc.png \ + protocols/16/simple.png \ + protocols/16/zephyr.png +@@ -250,57 +236,33 @@ ICONS_48 = icons/hicolor/48x48/apps/pidgin.png + ICONS_SCALABLE = icons/hicolor/scalable/apps/pidgin.svg + + PROTOCOLS_22_SCALABLE = \ +- protocols/22/scalable/aim.svg \ + protocols/22/scalable/bonjour.svg \ +- protocols/22/scalable/gadu-gadu.svg \ +- protocols/22/scalable/novell.svg \ +- protocols/22/scalable/icq.svg \ + protocols/22/scalable/irc.svg \ + protocols/22/scalable/jabber.svg \ +- protocols/22/scalable/meanwhile.svg \ + protocols/22/scalable/silc.svg \ + protocols/22/scalable/simple.svg \ + protocols/22/scalable/zephyr.svg + + PROTOCOLS_22 = \ +- protocols/22/aim.png \ + protocols/22/bonjour.png \ +- protocols/22/facebook.png \ +- protocols/22/gadu-gadu.png \ +- protocols/22/google-talk.png \ +- protocols/22/novell.png \ +- protocols/22/icq.png \ + protocols/22/irc.png \ + protocols/22/jabber.png \ +- protocols/22/meanwhile.png \ + protocols/22/silc.png \ + protocols/22/simple.png \ + protocols/22/zephyr.png + + PROTOCOLS_48 = \ +- protocols/48/aim.png \ + protocols/48/bonjour.png \ +- protocols/48/facebook.png \ +- protocols/48/gadu-gadu.png \ +- protocols/48/novell.png \ +- protocols/48/icq.png \ + protocols/48/irc.png \ + protocols/48/jabber.png \ +- protocols/48/meanwhile.png \ + protocols/48/silc.png \ + protocols/48/simple.png \ + protocols/48/zephyr.png + + PROTOCOLS_SCALABLE = \ +- protocols/scalable/aim.svg \ + protocols/scalable/bonjour.svg \ +- protocols/scalable/gadu-gadu.svg \ +- protocols/scalable/google-talk.svg \ +- protocols/scalable/novell.svg \ +- protocols/scalable/icq.svg \ + protocols/scalable/irc.svg \ + protocols/scalable/jabber.svg \ +- protocols/scalable/meanwhile.svg \ + protocols/scalable/silc.svg \ + protocols/scalable/simple.svg \ + protocols/scalable/zephyr.svg |