pidgin: src/gtkblist.c comparison

comparison src/gtkblist.c @ 12583:301e9f0841d7

[gaim-migrate @ 14911] Brutally murdered the per-account statusboxes; but didn't come up with any replacement committer: Tailor Script <tailor@pidgin.im>

author	Sean Egan <seanegan@gmail.com>
date	Tue, 20 Dec 2005 22:57:54 +0000
parents	1246935dd047
children	42ea8c3de6de

comparison

equal deleted inserted replaced

-:f75c0d35e032
+:301e9f0841d7
 	g_free(normalized);
 	return result;
 }
-static void account_enabled(GaimAccount *account, GaimGtkBuddyList *gtkblist)
-{
-	GtkWidget *box;
-	if (!gtkblist)
-		return;
-	box = gtk_gaim_status_box_new_with_account(account);
-	gtkblist->statusboxes = g_list_append(gtkblist->statusboxes, box);
-	gtk_box_pack_start(GTK_BOX(gtkblist->statusboxbox), box, FALSE, TRUE, 0);
-	gtk_widget_show(box);
-	update_menu_bar(gtkblist);
-}
-static void account_disabled(GaimAccount *account, GaimGtkBuddyList *gtkblist)
-{
-	GList *iter;
-	if (!gtkblist)
-		return;
-	for (iter = gtkblist->statusboxes; iter; iter = iter->next)
-	{
-		GtkWidget *box = iter->data;
-		GaimAccount *ac = NULL;
-		g_object_get(G_OBJECT(box), "account", &ac, NULL);
-		if (ac == account)
-		{
-			gtkblist->statusboxes = g_list_remove_link(gtkblist->statusboxes, iter);
-			gtk_widget_destroy(box);
-			break;
-		}
-	}
-	update_menu_bar(gtkblist);
-}
 static void account_modified(GaimAccount *account, GaimGtkBuddyList *gtkblist)
 {
 	if (!gtkblist)
 		return;
 	void *handle;
 	GtkCellRenderer *rend;
 	GtkTreeViewColumn *column;
 	GtkWidget *menu;
 	GtkWidget *sw;
-	GtkWidget *vpane;
 	GtkAccelGroup *accel_group;
 	GtkTreeSelection *selection;
 	GtkTargetEntry dte[] = {{"GAIM_BLIST_NODE", GTK_TARGET_SAME_APP, DRAG_ROW},
 				{"application/x-im-contact", 0, DRAG_BUDDY},
 				{"text/x-vcard", 0, DRAG_VCARD },
 	gtk_widget_show(menu);
 	gtk_box_pack_start(GTK_BOX(gtkblist->vbox), menu, FALSE, FALSE, 0);
 	accountmenu = gtk_item_factory_get_widget(gtkblist->ift, N_("/Accounts"));
-	/****************************** GtkVPaned ************************************/
-	vpane = gtk_vpaned_new();
-	gtk_widget_show(vpane);
-	gtk_box_pack_start(GTK_BOX(gtkblist->vbox), vpane, TRUE, TRUE, 0);
-	gtk_paned_set_position(GTK_PANED(vpane),
-	                       gaim_prefs_get_int("/gaim/gtk/blist/pane"));
-	g_signal_connect(G_OBJECT(vpane), "notify::position",
-	                 G_CALLBACK(pane_position_cb), NULL);
 	/****************************** GtkTreeView **********************************/
 	sw = gtk_scrolled_window_new(NULL,NULL);
 	gtk_widget_show(sw);
 	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_IN);
 	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 	/* Enable CTRL+F searching */
 	gtk_tree_view_set_search_column(GTK_TREE_VIEW(gtkblist->treeview), NAME_COLUMN);
 	gtk_tree_view_set_search_equal_func(GTK_TREE_VIEW(gtkblist->treeview), _search_func, NULL, NULL);
-	gtk_paned_pack1(GTK_PANED(vpane), sw, TRUE, FALSE);
+	gtk_box_pack_start(GTK_BOX(gtkblist->vbox), sw, TRUE, TRUE, 0);
 	gtk_container_add(GTK_CONTAINER(sw), gtkblist->treeview);
 	gaim_gtk_blist_update_columns();
-	/* TODO: functionize this */
+	gtkblist->statusbox = gtk_gaim_status_box_new();
-	{
-		GList *accounts, *l;
+	gtk_widget_show(gtkblist->statusbox);
-		GtkWidget *sw2 = gtk_scrolled_window_new(NULL, NULL);
+	gtk_box_pack_start(GTK_BOX(gtkblist->vbox), gtkblist->statusbox, FALSE, TRUE, 0);
-		/* Set up some per account status boxes */
-		gtkblist->statusboxbox = gtk_vbox_new(FALSE, 0);
-		gtkblist->statusboxes = NULL;
-		for (l = accounts = gaim_accounts_get_all_active(); l; l = l->next) {
-			GtkWidget *statusbox = gtk_gaim_status_box_new_with_account(l->data);
-			gtkblist->statusboxes = g_list_append(gtkblist->statusboxes, statusbox);
-			gtk_box_pack_start(GTK_BOX(gtkblist->statusboxbox), statusbox, FALSE, TRUE, 0);
-			gtk_widget_show(statusbox);
-		}
-		g_list_free(accounts);
-		gtk_widget_show(gtkblist->statusboxbox);
-		gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw2), gtkblist->statusboxbox);
-		gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw2), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-		gtk_widget_show(sw2);
-		gtk_paned_pack2(GTK_PANED(vpane), sw2, FALSE, TRUE);
-		gtkblist->statusbox = gtk_gaim_status_box_new();
-		gtk_widget_show(gtkblist->statusbox);
-		gtk_box_pack_start(GTK_BOX(gtkblist->vbox), gtkblist->statusbox, FALSE, TRUE, 0);
-	}
 	/* set the Show Offline Buddies option. must be done
 	 * after the treeview or faceprint gets mad. -Robot101
 	 */
 	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gtk_item_factory_get_item (gtkblist->ift, N_("/Buddies/Show Offline Buddies"))),
 	gaim_prefs_connect_callback(handle, "/gaim/gtk/sound/method",
 			gaim_gtk_blist_sound_method_pref_cb, NULL);
 	/* Setup some gaim signal handlers. */
 	gaim_signal_connect(gaim_accounts_get_handle(), "account-enabled",
-			gtkblist, GAIM_CALLBACK(account_enabled), gtkblist);
+			gtkblist, GAIM_CALLBACK(account_modified), gtkblist);
 	gaim_signal_connect(gaim_accounts_get_handle(), "account-disabled",
-			gtkblist, GAIM_CALLBACK(account_disabled), gtkblist);
+			gtkblist, GAIM_CALLBACK(account_modified), gtkblist);
 	gaim_signal_connect(gaim_accounts_get_handle(), "account-removed",
-			gtkblist, GAIM_CALLBACK(account_disabled), gtkblist);
+			gtkblist, GAIM_CALLBACK(account_modified), gtkblist);
 	gaim_signal_connect(gaim_gtk_account_get_handle(), "account-modified",
 			gtkblist, GAIM_CALLBACK(account_modified), gtkblist);
 	gaim_signal_connect(gaim_connections_get_handle(), "signed-on",

Mercurial > pidgin

comparison src/gtkblist.c @ 12583:301e9f0841d7