rpms/telepathy-glib/F-7 log-disconnect-from-bus.patch, NONE, 1.1 telepathy-glib.spec, 1.3, 1.4

[Guillaume Desmottes (gdesmott)]

Author: gdesmott

Update of /cvs/pkgs/rpms/telepathy-glib/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14105

Modified Files:
	telepathy-glib.spec 
Added Files:
	log-disconnect-from-bus.patch 
Log Message:
Update to 0.7.6. Backport package from the OLPC-2 branch.

log-disconnect-from-bus.patch:

--- NEW FILE log-disconnect-from-bus.patch ---
diff -rup telepathy-glib/telepathy-glib/run.c telepathy-glib-cassidy/telepathy-glib/run.c
--- telepathy-glib/telepathy-glib/run.c	2008-04-07 10:55:09.000000000 +0200
+++ telepathy-glib-cassidy/telepathy-glib/run.c	2008-04-18 11:38:46.000000000 +0200
@@ -37,6 +37,7 @@
 #include <telepathy-glib/run.h>
 
 #include <dbus/dbus-glib.h>
+#include <dbus/dbus-glib-lowlevel.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
@@ -45,6 +46,8 @@
 #include <telepathy-glib/base-connection-manager.h>
 #include <telepathy-glib/debug.h>
 #include <telepathy-glib/errors.h>
+#include <telepathy-glib/util.h>
+#include <telepathy-glib/dbus.h>
 
 #ifdef HAVE_EXECINFO_H
 #include <execinfo.h>
@@ -152,6 +155,20 @@ add_signal_handlers (void)
 #endif /* HAVE_SIGNAL && ENABLE_BACKTRACE */
 }
 
+static DBusHandlerResult
+dbus_filter_function (DBusConnection *connection,
+                      DBusMessage *message,
+                      void *user_data)
+{
+  if (dbus_message_is_signal (message, DBUS_INTERFACE_LOCAL, "Disconnected") &&
+      !tp_strdiff (dbus_message_get_path (message), DBUS_PATH_LOCAL))
+    {
+      g_warning ("Got disconnected from the session bus");
+    }
+
+  return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+}
+
 /**
  * tp_run_connection_manager:
  * @prog_name: The program name to be used in debug messages etc.
@@ -183,6 +200,7 @@ tp_run_connection_manager (const char *p
                            char **argv)
 {
   GLogLevelFlags fatal_mask;
+  DBusConnection *connection;
 
   add_signal_handlers ();
 
@@ -225,6 +243,13 @@ tp_run_connection_manager (const char *p
   g_signal_connect (manager, "no-more-connections",
       (GCallback) no_more_connections, NULL);
 
+  /* It appears that dbus-glib registers a filter that wrongly returns
+   * DBUS_HANDLER_RESULT_HANDLED for signals, so for *our* filter to have any
+   * effect, we need to install it before calling
+   * tp_base_connection_manager_register () */
+  connection = dbus_g_connection_get_connection (tp_get_bus ());
+  dbus_connection_add_filter (connection, dbus_filter_function, NULL, NULL);
+
   if (!tp_base_connection_manager_register (manager))
     {
       return 1;


Index: telepathy-glib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/F-7/telepathy-glib.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- telepathy-glib.spec	7 Sep 2007 18:04:16 -0000	1.3
+++ telepathy-glib.spec	23 Apr 2008 14:05:06 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           telepathy-glib
-Version:        0.5.14
-Release:        1%{?dist}
+Version:        0.7.6
+Release:        2%{?dist}
 Summary:        GLib bindings for Telepathy
 
 Group:          System Environment/Libraries
@@ -8,10 +8,12 @@
 URL:            http://telepathy.freedesktop.org/wiki/FrontPage
 Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:         log-disconnect-from-bus.patch
 
 BuildRequires:  gtk-doc
-BuildRequires:  dbus-devel >= 0.61
-BuildRequires:	dbus-glib-devel >= 0.72
+BuildRequires:  dbus-devel >= 0.95
+BuildRequires:	dbus-glib-devel >= 0.73
+BuildRequires:	glib2-devel >= 2.10
 BuildRequires:	libxslt
 BuildRequires:	python
 
@@ -27,8 +29,9 @@
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	telepathy-filesystem
-Requires:	dbus-devel
-Requires:	dbus-glib-devel
+Requires:	dbus-devel >= 0.95
+Requires:	dbus-glib-devel >= 0.73
+Requires:	glib2-devel >= 2.10
 Requires:	pkgconfig
 
 
@@ -37,23 +40,9 @@
 developing applications that use %{name}.
 
 
-%package 	unstable-static
-Summary:	Unstable Development files for %{name}
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:   	%{name}-devel = %{version}-%{release}
-Requires:   	pkgconfig
-
-
-%description unstable-static	
-The %{name}-unstable-static package contains libraries and header
-files for developing applications that use statically linked
-unstable API from %{name}. Packagers build requiring this package
-should be check to see if it is needed in future releases.
-
-
 %prep
 %setup -q
+%patch0 -p1 -b .log-disconnect
 
 
 %check
@@ -95,14 +84,10 @@
 %{_includedir}/telepathy-1.0/%{name}/
 
 
-%files unstable-static
-%defattr(-,root,root,-)
-%{_includedir}/telepathy-unstable/
-%{_libdir}/pkgconfig/%{name}-unstable.pc
-%{_libdir}/libtelepathy-glib-unstable.a
-
-
 %changelog
+* Wed Apr 23 2008 Guillaume Desmottes <guillaume.desmottes at collabora.co.uk> - 0.7.6-2
+- Update to 0.7.6. Backport package from the OLPC-2 branch.
+
 * Fri Sep  7 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.5.14-1
 - Update to 0.5.14.
 - Add BR on python.