rpms/epiphany/devel new-nm.patch, NONE, 1.1 epiphany.spec, 1.161, 1.162

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/epiphany/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25022

Modified Files:
	epiphany.spec 
Added Files:
	new-nm.patch 
Log Message:
Fix network status monitoring


new-nm.patch:

--- NEW FILE new-nm.patch ---
diff -up epiphany-2.20.0/src/ephy-net-monitor.c.new-nm epiphany-2.20.0/src/ephy-net-monitor.c
--- epiphany-2.20.0/src/ephy-net-monitor.c.new-nm	2007-10-15 13:04:01.000000000 -0400
+++ epiphany-2.20.0/src/ephy-net-monitor.c	2007-10-15 13:03:18.000000000 -0400
@@ -151,19 +151,9 @@ filter_func (DBusConnection *connection,
 
 	if (dbus_message_is_signal (message,
 				    NM_DBUS_INTERFACE,
-				    "DeviceNoLongerActive"))
+				    "StateChange"))
 	{
-		LOG ("EphyNetMonitor catches DeviceNoLongerActive signal");
-
-		ephy_net_monitor_check_network (monitor);
-
-		return DBUS_HANDLER_RESULT_HANDLED;
-	}
-	if (dbus_message_is_signal (message,
-				    NM_DBUS_INTERFACE,
-				    "DeviceNowActive"))
-	{
-		LOG ("EphyNetMonitor catches DeviceNowActive signal");
+		LOG ("EphyNetMonitor catches StateChange signal");
 
 		ephy_net_monitor_check_network (monitor);
 


Index: epiphany.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- epiphany.spec	18 Sep 2007 02:44:21 -0000	1.161
+++ epiphany.spec	15 Oct 2007 17:09:16 -0000	1.162
@@ -8,7 +8,7 @@
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
 Version: 2.20.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and GFDL+
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
@@ -47,6 +47,8 @@
 Patch0: epiphany-1.0.1-home-page.patch
 Patch1: epiphany-2.17.3-use-pango.patch
 Patch2: epiphany-2.18.1-default-bookmarks.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=486881 
+Patch3: new-nm.patch
 
 %description
 epiphany is a simple GNOME web browser based on the Mozilla rendering
@@ -84,6 +86,7 @@
 %patch0 -p1 -b .homepage
 %patch1 -p1 -b .use-pango
 %patch2 -p1 -b .default-bookmarks
+%patch3 -p1 -b .new-nm
 
 %build
 %ifnarch s390 s390x
@@ -190,6 +193,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Mon Oct 15 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-2
+- Fix network status monitoring with new NM (#332771)
+
 * Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
 - Update to 2.20.0