Remove the "network-status" signal from the embed single, and make it a

2005-10-12  Christian Persch  <chpe@cvs.gnome.org>

	* embed/ephy-embed-single.c: (ephy_embed_single_iface_init),
	(ephy_embed_single_set_network_status),
	(ephy_embed_single_get_network_status):
	* embed/ephy-embed-single.h:
	* embed/mozilla/EphySingle.cpp:
	* embed/mozilla/EphySingle.h:
	* embed/mozilla/mozilla-embed-single.cpp:
	* src/ephy-window.c: (sync_tab_icon), (sync_network_status),
	(ephy_window_dispose), (ephy_window_init):
	* src/epiphany.defs:
	* src/window-commands.c: (window_cmd_file_work_offline):

	Remove the "network-status" signal from the embed single, and
	make it a property instead. Keep track of the network status in
	EphySingle, and emit property notification when it changes.

1 files changed, 3 insertions, 4 deletions

diff --git a/embed/mozilla/EphySingle.cpp b/embed/mozilla/EphySingle.cpp
index 0d920900a..3a3948de0 100644
--- a/embed/mozilla/EphySingle.cpp
+++ b/embed/mozilla/EphySingle.cpp
@@ -45,6 +45,7 @@ NS_IMPL_ISUPPORTS1(EphySingle, nsIObserver)
 
 EphySingle::EphySingle()
 : mOwner(nsnull)
+, mIsOnline(PR_TRUE) /* nsIOService doesn't send an initial notification, assume we start on-line */
 {
 	LOG ("EphySingle ctor");
 }
@@ -233,11 +234,9 @@ NS_IMETHODIMP EphySingle::Observe(nsISupports *aSubject,
 	else if (strcmp (aTopic, "network:offline-status-changed") == 0)
 	{
 		/* aData is either (PRUnichar[]) "offline" or "online" */
-		gboolean offline;
+		mIsOnline = (aData && aData[0] == 'o' && aData[1] == 'n');
 
-		offline = (aData[1] == 'f');
-
-		g_signal_emit_by_name (mOwner, "network-status", offline);
+		g_object_notify (G_OBJECT (mOwner), "network-status");
 	}
 	else
 	{