diff src/gtkaccount.c @ 6122:914f2d5da21c

[gaim-migrate @ 6596] Fix 2 compiler warnings. Make auto-login for IRC accounts without passwords work. Thanks to Luke for finding this and making a kick-assingly correct guess as to the cause. Fix the MSN sign-off-infinite-loops-after-getting-info-about-mail bug. Fix "Yahoo smilies for the "angel" smiley are incorrect" http://sourceforge.net/tracker/index.php?func=detail&aid=728663&group_id=235&atid=100235 Fix a bug that I introduced yesterday freaking afternoon. I would have commited the fix yesterday, but SF CVS was not working. <faceprint> KingAnt: you just broke the ticker <KingAnt> faceprint: How so? <KingAnt> Oh, event_signon? <faceprint> the ticker is what needs event_buddy_signon to get called twice <faceprint> i don't know what is the right behavior, but i'm in bootloader hell, just thought i'd alert you <KingAnt> faceprint: So that it doesn't always show people with the open door? <faceprint> KingAnt: right I just added an ugly little timeout that updates the icon after 11 seconds. The icon in the blist gets updated after 10. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Mon, 14 Jul 2003 22:09:42 +0000
parents 0d2bd49c611e
children adabfcf8abe1
line wrap: on
line diff
--- a/src/gtkaccount.c	Mon Jul 14 14:36:03 2003 +0000
+++ b/src/gtkaccount.c	Mon Jul 14 22:09:42 2003 +0000
@@ -711,6 +711,13 @@
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 	gtk_widget_show(item);
 
+	/* HTTP */
+	item = gtk_menu_item_new_with_label(_("HTTP"));
+	g_object_set_data(G_OBJECT(item), "proxytype",
+					  GINT_TO_POINTER(GAIM_PROXY_HTTP));
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+	gtk_widget_show(item);
+
 	/* SOCKS 4 */
 	item = gtk_menu_item_new_with_label(_("SOCKS 4"));
 	g_object_set_data(G_OBJECT(item), "proxytype",
@@ -725,13 +732,6 @@
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 	gtk_widget_show(item);
 
-	/* HTTP */
-	item = gtk_menu_item_new_with_label(_("HTTP"));
-	g_object_set_data(G_OBJECT(item), "proxytype",
-					  GINT_TO_POINTER(GAIM_PROXY_HTTP));
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
-	gtk_widget_show(item);
-
 	gtk_option_menu_set_menu(GTK_OPTION_MENU(dropdown), menu);
 
 	return dropdown;