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; 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 (g_strcmp0(default_proto_id, "prpl-gtalk") == 0) - 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),