pidgin.yaz: pidgin/gtkconv.c comparison

comparison pidgin/gtkconv.c @ 19898:be8bb6f98c01

Get rid of hidden_convwin.

author	Sadrul Habib Chowdhury <imadil@gmail.com>
date	Wed, 05 Sep 2007 00:45:55 +0000
parents	8a5d7be3e22e
children	25f4be036a16 bea1d9075c7e

comparison

equal deleted inserted replaced

-:8a5d7be3e22e
+:be8bb6f98c01
 } InviteBuddyInfo;
 static GtkWidget *invite_dialog = NULL;
 static GtkWidget *warn_close_dialog = NULL;
-static PidginWindow *hidden_convwin = NULL;
 static GList *window_list = NULL;
 /* Lists of status icons at all available sizes for use as window icons */
 static GList *available_list = NULL;
 static GList *away_list = NULL;
 pidgin_conv_present_conversation(PurpleConversation *conv)
 {
 	PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv);
 	GdkModifierType state;
-	if(gtkconv->win==hidden_convwin) {
+	if (gtkconv == NULL) {
-		pidgin_conv_window_remove_gtkconv(hidden_convwin, gtkconv);
+		pidgin_conv_attach_to_conversation(conv);
-		pidgin_conv_placement_place(gtkconv);
+		gtkconv = PIDGIN_CONVERSATION(conv);
 	}
 	pidgin_conv_switch_active_conversation(conv);
 	/* Switch the tab only if the user initiated the event by pressing
 	 * a button or hitting a key. */
 	for (; l != NULL && (max_count == 0 || c < max_count); l = l->next) {
 		PurpleConversation *conv = (PurpleConversation*)l->data;
 		PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv);
-		if(gtkconv == NULL || gtkconv->active_conv != conv)
+		if (gtkconv != NULL && gtkconv->active_conv != conv)
 			continue;
+		if (gtkconv == NULL) {
-		if (gtkconv->unseen_state >= min_state
+			if (!hidden_only)
-			&& (!hidden_only ||
+				continue;
-				(hidden_only && gtkconv->win == hidden_convwin))) {
 			r = g_list_prepend(r, conv);
 			c++;
+		} else {
+			if (gtkconv->unseen_state >= min_state && !hidden_only) {
+				r = g_list_prepend(r, conv);
+				c++;
+			}
 		}
 	}
 	return r;
 }
 	GList *list;
 	PidginConversation *gtkconv;
 	PurpleConversation *conv;
 	GtkWidget *item;
-	if (win->window == NULL || win == hidden_convwin)
+	if (win->window == NULL)
 		return;
 	gtkconv = pidgin_conv_window_get_active_gtkconv(win);
 	if (gtkconv == NULL)
 		return;
 	PidginConversation *gtkconv;
 	PurpleConversationType conv_type = purple_conversation_get_type(conv);
 	GtkWidget *pane = NULL;
 	GtkWidget *tab_cont;
+	if (hidden)
+		return;
 	if (conv_type == PURPLE_CONV_TYPE_IM && (gtkconv = pidgin_conv_find_gtkconv(conv))) {
 		conv->ui_data = gtkconv;
 		if (!g_list_find(gtkconv->convs, conv))
 			gtkconv->convs = g_list_prepend(gtkconv->convs, conv);
 		pidgin_conv_switch_active_conversation(conv);
 	g_signal_connect_swapped(G_OBJECT(pane), "focus",
 	                         G_CALLBACK(gtk_widget_grab_focus),
 	                         gtkconv->entry);
-	if (hidden)
+	pidgin_conv_placement_place(gtkconv);
-		pidgin_conv_window_add_gtkconv(hidden_convwin, gtkconv);
-	else
-		pidgin_conv_placement_place(gtkconv);
 	if (nick_colors == NULL) {
 		nbr_nick_colors = NUM_NICK_COLORS;
 		nick_colors = generate_nick_colors(&nbr_nick_colors, gtk_widget_get_style(gtkconv->imhtml)->base[GTK_STATE_NORMAL]);
 	}
 }
+#if 0
 static void
 pidgin_conv_new_hidden(PurpleConversation *conv)
 {
 	private_gtkconv_new(conv, TRUE);
 }
+#endif
 void
 pidgin_conv_new(PurpleConversation *conv)
 {
 	private_gtkconv_new(conv, FALSE);
 static void
 account_status_changed_cb(PurpleAccount *account, PurpleStatus *oldstatus,
 PurpleStatus *newstatus)
 {
+#if 0
 	GList *l;
 	PurpleConversation *conv = NULL;
 	PidginConversation *gtkconv;
 	if(strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new"), "away")!=0)
 		return;
 	if(purple_status_is_available(oldstatus) || !purple_status_is_available(newstatus))
 		return;
+#endif
-	while ((l = hidden_convwin->gtkconvs) != NULL)
-	{
-		gtkconv = l->data;
-		conv = gtkconv->active_conv;
-		while(l && !purple_status_is_available(
-					purple_account_get_active_status(
-					purple_conversation_get_account(conv))))
-			l = l->next;
-		if (!l)
-			break;
-		pidgin_conv_window_remove_gtkconv(hidden_convwin, gtkconv);
-		pidgin_conv_placement_place(gtkconv);
-		/* TODO: do we need to do anything for any other conversations that are in the same gtkconv here?
-		 * I'm a little concerned that not doing so will cause the "pending" indicator in the gtkblist not to be cleared. -DAA*/
-		purple_conversation_update(conv, PURPLE_CONV_UPDATE_UNSEEN);
-	}
 }
 static void
 hide_new_pref_cb(const char *name, PurplePrefType type,
 				 gconstpointer value, gpointer data)
 {
 	GList *l;
-	PurpleConversation *conv = NULL;
-	PidginConversation *gtkconv;
 	gboolean when_away = FALSE;
-	if(!hidden_convwin)
-		return;
 	if(strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new"), "always")==0)
 		return;
 	if(strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new"), "away")==0)
 		when_away = TRUE;
-	while ((l = hidden_convwin->gtkconvs) != NULL)
+	for (l = purple_get_conversations(); l; l = l->next)
 	{
-		gtkconv = l->data;
+		PurpleConversation *conv = l->data;
+		PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv);
-		conv = gtkconv->active_conv;
+		if (gtkconv)
+			continue;
 		if(when_away && !purple_status_is_available(
 							purple_account_get_active_status(
 							purple_conversation_get_account(conv))))
 			continue;
+		pidgin_conv_attach_to_conversation(conv);
-		pidgin_conv_window_remove_gtkconv(hidden_convwin, gtkconv);
-		pidgin_conv_placement_place(gtkconv);
 	}
 }
 static void
 	purple_signal_connect(purple_conversations_get_handle(), "received-im-msg",
 						handle, G_CALLBACK(received_im_msg_cb), NULL);
 	purple_conversations_set_ui_ops(&conversation_ui_ops);
-	hidden_convwin = pidgin_conv_window_new();
-	window_list = g_list_remove(window_list, hidden_convwin);
 	purple_signal_connect(purple_accounts_get_handle(), "account-status-changed",
 handle, PURPLE_CALLBACK(account_status_changed_cb), NULL);
 	/* Callbacks to update a conversation */
 pidgin_conversations_uninit(void)
 {
 	purple_prefs_disconnect_by_handle(pidgin_conversations_get_handle());
 	purple_signals_disconnect_by_handle(pidgin_conversations_get_handle());
 	purple_signals_unregister_by_instance(pidgin_conversations_get_handle());
-	pidgin_conv_window_destroy(hidden_convwin);
-	hidden_convwin=NULL;
 }
 	win->gtkconvs = g_list_remove(win->gtkconvs, gtkconv);
 	if (win->gtkconvs && win->gtkconvs->next == NULL)
 		pidgin_conv_tab_pack(win, win->gtkconvs->data);
-	if (!win->gtkconvs && win != hidden_convwin)
+	if (!win->gtkconvs)
 		pidgin_conv_window_destroy(win);
 }
 PidginConversation *
 pidgin_conv_window_get_gtkconv_at_index(const PidginWindow *win, int index)
 }
 gboolean
 pidgin_conv_is_hidden(PidginConversation *gtkconv)
 {
-	g_return_val_if_fail(gtkconv != NULL, FALSE);
+	return (gtkconv == NULL);
-	return (gtkconv->win == hidden_convwin);
 }
 /* Algorithm from http://www.w3.org/TR/AERT#color-contrast */
 static gboolean

Mercurial > pidgin.yaz

comparison pidgin/gtkconv.c @ 19898:be8bb6f98c01