Attachment 30472 Details for Bug 24394 – Current patch against 08-portability branch

[patch] Current patch against 08-portability branch

tp-glib08.patch (text/plain), 971 bytes, created by Matti Reijonen on 2009-10-16 00:43:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matti Reijonen

Created: 2009-10-16 00:43:36 UTC

Size: 971 bytes

patch

obsolete

>diff --git a/telepathy-glib/debug.c b/telepathy-glib/debug.c
>index 51e20ae..56c8cb5 100644
>--- a/telepathy-glib/debug.c
>+++ b/telepathy-glib/debug.c
>@@ -405,14 +405,14 @@ tp_debug_divert_messages (const gchar *filename)
>       return;
>     }
> 
>-  if (dup2 (fd, STDOUT_FILENO) == -1)
>+  if (dup2 (fd, 1) == -1)
>     {
>       g_warning ("Error duplicating stdout file descriptor: %s",
>           g_strerror (errno));
>       return;
>     }
> 
>-  if (dup2 (fd, STDERR_FILENO) == -1)
>+  if (dup2 (fd, 2) == -1)
>     {
>       g_warning ("Error duplicating stderr file descriptor: %s",
>           g_strerror (errno));
>diff --git a/telepathy-glib/proxy.h b/telepathy-glib/proxy.h
>index bd6b3a9..97406ce 100644
>--- a/telepathy-glib/proxy.h
>+++ b/telepathy-glib/proxy.h
>@@ -34,6 +34,8 @@ typedef struct _TpProxyPrivate TpProxyPrivate;
> 
> typedef struct _TpProxy TpProxy;
> 
>+#undef interface
>+
> #define TP_DBUS_ERRORS (tp_dbus_errors_quark ())
> GQuark tp_dbus_errors_quark (void);
>

Actions: View | Splinter Review

Attachments on bug 24394: 30157 | 30472

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.