[Gaim-commits] SF.net SVN: gaim: [17940] trunk/gtk/gtkstatusbox.c

[<sa...@us...>]

Revision: 17940
          http://svn.sourceforge.net/gaim/?rev=17940&view=rev
Author:   sadrul
Date:     2006-12-10 01:02:47 -0800 (Sun, 10 Dec 2006)

Log Message:
-----------
Make the per-account statusboxes work.

Modified Paths:
--------------
    trunk/gtk/gtkstatusbox.c

Modified: trunk/gtk/gtkstatusbox.c
===================================================================
--- trunk/gtk/gtkstatusbox.c	2006-12-10 08:29:03 UTC (rev 17939)
+++ trunk/gtk/gtkstatusbox.c	2006-12-10 09:02:47 UTC (rev 17940)
@@ -764,8 +764,7 @@
 					path = gtk_tree_model_get_path(GTK_TREE_MODEL(status_box->dropdown_store), &iter);
 					break;
 				}
-			}
-			while (gtk_tree_model_iter_next(GTK_TREE_MODEL(status_box->dropdown_store), &iter));
+			} while (gtk_tree_model_iter_next(GTK_TREE_MODEL(status_box->dropdown_store), &iter));
 		}
 	}
 
@@ -2154,7 +2153,7 @@
 
 		status = gaim_account_get_active_status(status_box->account);
 
-		g_object_get(G_OBJECT(status_box), "active", &active, NULL);
+		active = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(status_box), "active"));
 
 		status_type = find_status_type_by_index(status_box->account, active);
 		id = gaim_status_type_get_id(status_type);
@@ -2250,11 +2249,14 @@
 	GtkGaimStatusBoxItemType type;
 	gpointer data;
 	GList *accounts = NULL, *node;
+	int active;
 
 	
 	if (!gtk_tree_model_get_iter (GTK_TREE_MODEL(status_box->dropdown_store), &iter, path))
 		return;
+	active = gtk_tree_path_get_indices(path)[0];
 	gtk_tree_path_free(path);
+	g_object_set_data(G_OBJECT(status_box), "active", GINT_TO_POINTER(active));
 	
 	gtk_tree_model_get(GTK_TREE_MODEL(status_box->dropdown_store), &iter,
 			   TYPE_COLUMN, &type,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.