[Galago-commits] r2297 - in trunk/libgalago-gtk: . libgalago-gtk

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2005-11-10 23:57:31 -0800 (Thu, 10 Nov 2005)
New Revision: 2297

Modified:
   trunk/libgalago-gtk/ChangeLog
   trunk/libgalago-gtk/libgalago-gtk/galago-gtk-account-combo-box.c
   trunk/libgalago-gtk/libgalago-gtk/galago-gtk-account-option-menu.c
Log:
Updated to use the connection-state-changed instead of connected/disconnected signals on GalagoAccount.


Modified: trunk/libgalago-gtk/ChangeLog
===================================================================
--- trunk/libgalago-gtk/ChangeLog	2005-11-11 07:53:44 UTC (rev 2296)
+++ trunk/libgalago-gtk/ChangeLog	2005-11-11 07:57:31 UTC (rev 2297)
@@ -1,3 +1,10 @@
+Thu Nov 10 23:59:30 PST 2005  Christian Hammond <chipx86 at chipx86.com>
+
+	* libgalago-gtk/galago-gtk-account-combo-box.c:
+	* libgalago-gtk/galago-gtk-account-option-menu.c:
+	  - Updated to use the connection-state-changed instead of
+	    connected/disconnected signals on GalagoAccount.
+
 Sun Nov 06 15:46:46 PST 2005  Christian Hammond <chipx86 at chipx86.com>
 
 	* libgalago-gtk/galago-gtk-account-combo-box.c:

Modified: trunk/libgalago-gtk/libgalago-gtk/galago-gtk-account-combo-box.c
===================================================================
--- trunk/libgalago-gtk/libgalago-gtk/galago-gtk-account-combo-box.c	2005-11-11 07:53:44 UTC (rev 2296)
+++ trunk/libgalago-gtk/libgalago-gtk/galago-gtk-account-combo-box.c	2005-11-11 07:57:31 UTC (rev 2297)
@@ -43,8 +43,7 @@
 
 	gulong account_added_id;
 	gulong account_removed_id;
-	gulong account_connected_id;
-	gulong account_disconnected_id;
+	gulong account_conn_state_changed_id;
 	gulong person_added_id;
 	gulong person_destroy_id;
 };
@@ -194,15 +193,10 @@
 												   GALAGO_TYPE_SERVICE),
 								   0, account_added_removed_cb, combobox, NULL);
 
-	combobox->priv->account_connected_id =
-		g_signal_add_emission_hook(g_signal_lookup("connected",
+	combobox->priv->account_conn_state_changed_id =
+		g_signal_add_emission_hook(g_signal_lookup("connection-state-changed",
 												   GALAGO_TYPE_ACCOUNT),
 								   0, account_conn_changed_cb, combobox, NULL);
-
-	combobox->priv->account_disconnected_id =
-		g_signal_add_emission_hook(g_signal_lookup("disconnected",
-												   GALAGO_TYPE_ACCOUNT),
-								   0, account_conn_changed_cb, combobox, NULL);
 }
 
 static void
@@ -249,13 +243,9 @@
 		combobox->priv->account_removed_id);
 
 	GALAGO_GTK_DISCONNECT_EMISSION_HANDLER(
-		GALAGO_TYPE_ACCOUNT, "connected",
-		combobox->priv->account_connected_id);
+		GALAGO_TYPE_ACCOUNT, "connection-state-changed",
+		combobox->priv->account_conn_state_changed_id);
 
-	GALAGO_GTK_DISCONNECT_EMISSION_HANDLER(
-		GALAGO_TYPE_ACCOUNT, "disconnected",
-		combobox->priv->account_disconnected_id);
-
 	if (GTK_OBJECT_CLASS(parent_class)->destroy)
 		GTK_OBJECT_CLASS(parent_class)->destroy(obj);
 }

Modified: trunk/libgalago-gtk/libgalago-gtk/galago-gtk-account-option-menu.c
===================================================================
--- trunk/libgalago-gtk/libgalago-gtk/galago-gtk-account-option-menu.c	2005-11-11 07:53:44 UTC (rev 2296)
+++ trunk/libgalago-gtk/libgalago-gtk/galago-gtk-account-option-menu.c	2005-11-11 07:57:31 UTC (rev 2297)
@@ -43,8 +43,7 @@
 
 	gulong account_added_id;
 	gulong account_removed_id;
-	gulong account_connected_id;
-	gulong account_disconnected_id;
+	gulong account_conn_state_changed_id;
 
 	gulong person_added_id;
 	gulong person_destroy_id;
@@ -211,14 +210,6 @@
 		GALAGO_TYPE_SERVICE, "account-removed",
 		optmenu->priv->account_removed_id);
 
-	GALAGO_GTK_DISCONNECT_EMISSION_HANDLER(
-		GALAGO_TYPE_ACCOUNT, "connected",
-		optmenu->priv->account_connected_id);
-
-	GALAGO_GTK_DISCONNECT_EMISSION_HANDLER(
-		GALAGO_TYPE_ACCOUNT, "disconnected",
-		optmenu->priv->account_disconnected_id);
-
 	if (GTK_OBJECT_CLASS(parent_class)->destroy)
 		GTK_OBJECT_CLASS(parent_class)->destroy(obj);
 }