rpms/telepathy-salut/OLPC-3 use-tp_debug_divert_messages.patch, NONE, 1.1 telepathy-salut.spec, 1.23, 1.24

[Guillaume Desmottes (gdesmott)]

Author: gdesmott

Update of /cvs/pkgs/rpms/telepathy-salut/OLPC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31569

Modified Files:
	telepathy-salut.spec 
Added Files:
	use-tp_debug_divert_messages.patch 
Log Message:
Use tp_debug_divert_messages instead of our own copy of it (#7833)


use-tp_debug_divert_messages.patch:

--- NEW FILE use-tp_debug_divert_messages.patch ---
diff --git a/src/debug.c b/src/debug.c
index 9331247..f274beb 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -13,39 +13,6 @@
 
 #include "debug.h"
 
-void
-debug_set_log_file_from_env (void)
-{
-  const gchar *output_file;
-  int out;
-
-  output_file = g_getenv ("SALUT_LOGFILE");
-  if (output_file == NULL)
-    return;
-
-  out = g_open (output_file, O_WRONLY | O_CREAT | O_TRUNC, 0644);
-  if (out == -1)
-    {
-      g_warning ("Can't open logfile '%s': %s", output_file,
-          g_strerror (errno));
-      return;
-    }
-
-  if (dup2 (out, STDOUT_FILENO) == -1)
-    {
-      g_warning ("Error when duplicating stdout file descriptor: %s",
-          g_strerror (errno));
-      return;
-    }
-
-  if (dup2 (out, STDERR_FILENO) == -1)
-    {
-      g_warning ("Error when duplicating stderr file descriptor: %s",
-          g_strerror (errno));
-      return;
-    }
-}
-
 #ifdef ENABLE_DEBUG
 
 static DebugFlags flags = 0;
diff --git a/src/debug.h b/src/debug.h
index 9b25d1d..8ecc18f 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -8,10 +8,6 @@
 
 #include <gibber/gibber-xmpp-stanza.h>
 
-G_BEGIN_DECLS
-
-void debug_set_log_file_from_env (void);
-
 #ifdef ENABLE_DEBUG
 
 typedef enum
diff --git a/src/salut.c b/src/salut.c
index c303a4c..706e2cf 100644
--- a/src/salut.c
+++ b/src/salut.c
@@ -24,7 +24,7 @@ main (int argc, char **argv)
   g_type_init ();
   g_set_prgname ("telepathy-salut");
 
-  debug_set_log_file_from_env ();
+  tp_debug_divert_messages (g_getenv ("SALUT_LOGFILE"));
   debug_set_flags_from_env ();
 
   if (g_getenv ("SALUT_PERSIST"))
diff --git a/tests/salut-debug.c b/tests/salut-debug.c
index 5efdfb6..8c1695c 100644
--- a/tests/salut-debug.c
+++ b/tests/salut-debug.c
@@ -24,7 +24,7 @@ main (int argc, char **argv)
   g_type_init ();
   g_set_prgname ("telepathy-salut");
 
-  debug_set_log_file_from_env ();
+  tp_debug_divert_messages (g_getenv ("SALUT_LOGFILE"));
   debug_set_flags_from_env ();
 
   if (g_getenv ("SALUT_PERSIST"))



Index: telepathy-salut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-salut/OLPC-3/telepathy-salut.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- telepathy-salut.spec	4 Jul 2008 09:59:29 -0000	1.23
+++ telepathy-salut.spec	15 Aug 2008 10:10:42 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           telepathy-salut
 Version:        0.3.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Link-local XMPP telepathy connection manager
 
 Group:          Applications/Communications
@@ -9,6 +9,7 @@
 Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
 Patch0:         salut-olpc-no-dbus-uid-check.patch
 Patch1:         salut-chmod-unix-socket.patch
+Patch2:         use-tp_debug_divert_messages.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-devel >= 1.1.0
@@ -36,6 +37,7 @@
 %setup -q
 %patch0 -p1 -b .dbus-uid
 %patch1 -p1 -b .chmod-socket
+%patch2 -p1 -b .divert-messages
 
 
 %build
@@ -63,6 +65,9 @@
 %{_mandir}/man8/%{name}.8.gz
 
 %changelog
+* Fri Aug 15 2008 Guillaume Desmottes <guillaume.desmottes at collabora.co.uk> - 0.3.3-5
+- Use tp_debug_divert_messages instead of our own copy of it (#7833)
+
 * Thu Jul 4 2008 Guillaume Desmottes <guillaume.desmottes at collabora.co.uk> - 0.3.3-4
 - Hopefully fix html documentation installation