Mercurial > pidgin.yaz

changeset 8884:dd6b4f259f5b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 9653] Eradicate "Show logins in window" Sorry if these commit emails piss you off committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Thu, 06 May 2004 05:10:15 +0000
parents 7e6ab16d3549
children 4274f888477e
files src/conversation.c src/gaimrc.c src/gtkprefs.c src/server.c
diffstat 4 files changed, 31 insertions(+), 47 deletions(-) [+]
line wrap: on
line diff
--- a/src/conversation.c	Thu May 06 05:03:05 2004 +0000
+++ b/src/conversation.c	Thu May 06 05:10:15 2004 +0000
@@ -2620,7 +2620,6 @@
 
 	/* Conversations -> IM */
 	gaim_prefs_add_none("/core/conversations/im");
-	gaim_prefs_add_bool("/core/conversations/im/show_login", TRUE);
 	gaim_prefs_add_bool("/core/conversations/im/send_typing", TRUE);
 
 	gaim_prefs_connect_callback("/core/conversations/use_alias_for_title",
--- a/src/gaimrc.c	Thu May 06 05:03:05 2004 +0000
+++ b/src/gaimrc.c	Thu May 06 05:10:15 2004 +0000
@@ -922,8 +922,6 @@
 						 ? GAIM_BUTTON_NONE : GAIM_BUTTON_TEXT)));
 			gaim_prefs_set_bool("/gaim/gtk/conversations/ignore_colors",
 					display_options & OPT_DISP_IGNORE_COLOUR);
-			gaim_prefs_set_bool("/core/conversations/im/show_login",
-					display_options & OPT_DISP_SHOW_LOGON);
 			gaim_prefs_set_bool("/core/conversations/chat/show_join",
 					display_options & OPT_DISP_CHAT_LOGON);
 			gaim_prefs_set_int("/gaim/gtk/conversations/im/button_type",
@@ -1020,8 +1018,6 @@
 
 			gaim_prefs_set_bool("/gaim/gtk/conversations/im/raise_on_events",
 					im_options & OPT_IM_POPUP);
-			gaim_prefs_set_bool("/core/conversations/im/show_login",
-					im_options & OPT_IM_LOGON);
 			gaim_prefs_set_bool("/gaim/gtk/conversations/im/button_type",
 					((im_options & OPT_IM_BUTTON_XPM)
 					 ? ((im_options & OPT_IM_BUTTON_TEXT)
--- a/src/gtkprefs.c	Thu May 06 05:03:05 2004 +0000
+++ b/src/gtkprefs.c	Thu May 06 05:10:15 2004 +0000
@@ -991,11 +991,6 @@
 	gaim_gtk_prefs_checkbox(_("Enable buddy icon a_nimation"),
 			"/gaim/gtk/conversations/im/animate_buddy_icons", vbox);
 
-#if 0 /* PREFSLASH04 */
-	vbox = gaim_gtk_make_frame (ret, _("Display"));
-	gaim_gtk_prefs_checkbox(_("Show _logins in window"),
-			"/core/conversations/im/show_login", vbox);
-#endif /* PREFSLASH04 */
 	vbox = gaim_gtk_make_frame (ret, _("Typing Notification"));
 	gaim_gtk_prefs_checkbox(_("Notify buddies that you are _typing to them"),
 			"/core/conversations/im/send_typing", vbox);
--- a/src/server.c	Thu May 06 05:03:05 2004 +0000
+++ b/src/server.c	Thu May 06 05:10:15 2004 +0000
@@ -1150,26 +1150,23 @@
 
 
 	if (signing_on) {
-		if (gaim_prefs_get_bool("/core/conversations/im/show_login")) {
-			if (c != NULL) {
-
-				char *tmp = g_strdup_printf(_("%s logged in."),
-											gaim_get_buddy_alias(b));
+		if (c != NULL) {
+			char *tmp = g_strdup_printf(_("%s logged in."),
+										gaim_get_buddy_alias(b));
 
-				gaim_conversation_write(c, NULL, tmp, GAIM_MESSAGE_SYSTEM,
-										time(NULL));
-				g_free(tmp);
-			}
-			else if (awayqueue && find_queue_total_by_name(b->name)) {
-				struct queued_message *qm = g_new0(struct queued_message, 1);
-				g_snprintf(qm->name, sizeof(qm->name), "%s", b->name);
-				qm->message = g_strdup_printf(_("%s logged in."),
-											  gaim_get_buddy_alias(b));
-				qm->account = gc->account;
-				qm->tm = time(NULL);
-				qm->flags = GAIM_MESSAGE_SYSTEM;
-				message_queue = g_slist_append(message_queue, qm);
-			}
+			gaim_conversation_write(c, NULL, tmp, GAIM_MESSAGE_SYSTEM,
+									time(NULL));
+			g_free(tmp);
+		}
+		else if (awayqueue && find_queue_total_by_name(b->name)) {
+			struct queued_message *qm = g_new0(struct queued_message, 1);
+			g_snprintf(qm->name, sizeof(qm->name), "%s", b->name);
+			qm->message = g_strdup_printf(_("%s logged in."),
+										  gaim_get_buddy_alias(b));
+			qm->account = gc->account;
+			qm->tm = time(NULL);
+			qm->flags = GAIM_MESSAGE_SYSTEM;
+			message_queue = g_slist_append(message_queue, qm);
 		}
 		gaim_sound_play_event(GAIM_SOUND_BUDDY_ARRIVE);
 
@@ -1234,24 +1231,21 @@
 	}
 
 	if (signing_off) {
-		if (gaim_prefs_get_bool("/core/conversations/im/show_login")) {
-			if (c != NULL) {
-
-				char *tmp = g_strdup_printf(_("%s logged out."),
-											gaim_get_buddy_alias(b));
-				gaim_conversation_write(c, NULL, tmp,
-										GAIM_MESSAGE_SYSTEM, time(NULL));
-				g_free(tmp);
-			} else if (awayqueue && find_queue_total_by_name(b->name)) {
-				struct queued_message *qm = g_new0(struct queued_message, 1);
-				g_snprintf(qm->name, sizeof(qm->name), "%s", b->name);
-				qm->message = g_strdup_printf(_("%s logged out."),
-											  gaim_get_buddy_alias(b));
-				qm->account = gc->account;
-				qm->tm = time(NULL);
-				qm->flags = GAIM_MESSAGE_SYSTEM;
-				message_queue = g_slist_append(message_queue, qm);
-			}
+		if (c != NULL) {
+			char *tmp = g_strdup_printf(_("%s logged out."),
+										gaim_get_buddy_alias(b));
+			gaim_conversation_write(c, NULL, tmp,
+									GAIM_MESSAGE_SYSTEM, time(NULL));
+			g_free(tmp);
+		} else if (awayqueue && find_queue_total_by_name(b->name)) {
+			struct queued_message *qm = g_new0(struct queued_message, 1);
+			g_snprintf(qm->name, sizeof(qm->name), "%s", b->name);
+			qm->message = g_strdup_printf(_("%s logged out."),
+										  gaim_get_buddy_alias(b));
+			qm->account = gc->account;
+			qm->tm = time(NULL);
+			qm->flags = GAIM_MESSAGE_SYSTEM;
+			message_queue = g_slist_append(message_queue, qm);
 		}
 		serv_got_typing_stopped(gc, name); /* obviously not typing */
 		gaim_sound_play_event(GAIM_SOUND_BUDDY_LEAVE);