diff --git a/pidgin/gtkutils.c b/pidgin/gtkutils.c index 8a60983..8d2a405 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 1d5ebe5..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 \ @@ -202,24 +200,16 @@ EMOTES_SMALL_16_SCALABLE = \ PROTOCOLS_16_SCALABLE = \ protocols/16/scalable/bonjour.svg \ - protocols/16/scalable/gadu-gadu.svg \ - protocols/16/scalable/novell.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/bonjour.png \ - protocols/16/facebook.png \ - protocols/16/gadu-gadu.png \ - protocols/16/google-talk.png \ - protocols/16/novell.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 @@ -247,48 +237,32 @@ ICONS_SCALABLE = icons/hicolor/scalable/apps/pidgin.svg PROTOCOLS_22_SCALABLE = \ protocols/22/scalable/bonjour.svg \ - protocols/22/scalable/gadu-gadu.svg \ - protocols/22/scalable/novell.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/bonjour.png \ - protocols/22/facebook.png \ - protocols/22/gadu-gadu.png \ - protocols/22/google-talk.png \ - protocols/22/novell.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/bonjour.png \ - protocols/48/facebook.png \ - protocols/48/gadu-gadu.png \ - protocols/48/novell.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/bonjour.svg \ - protocols/scalable/gadu-gadu.svg \ - protocols/scalable/google-talk.svg \ - protocols/scalable/novell.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