Attachment 61035 Details for Bug 49384 – [Gabble, 1/2] Stop using deprecated debug-ansi.h

[patch] [Gabble, 1/2] Stop using deprecated debug-ansi.h

0001-Stop-using-deprecated-debug-ansi.h.patch (text/plain), 1.85 KB, created by Simon McVittie on 2012-05-04 07:07:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2012-05-04 07:07:10 UTC

Size: 1.85 KB

patch

obsolete

>From 22a28ff349e26be61832d66df858edfd1825c3ea Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Fri, 4 May 2012 14:47:49 +0100
>Subject: [PATCH 1/2] Stop using deprecated debug-ansi.h
>
>---
> src/media-stream.c |    2 --
> src/muc-channel.c  |    6 ++----
> 2 files changed, 2 insertions(+), 6 deletions(-)
>
>diff --git a/src/media-stream.c b/src/media-stream.c
>index 75c9ea3..cf94c97 100644
>--- a/src/media-stream.c
>+++ b/src/media-stream.c
>@@ -27,8 +27,6 @@
> #include <string.h>
> 
> #include <dbus/dbus-glib.h>
>-#include <telepathy-glib/debug-ansi.h>
>-
> #include <telepathy-glib/dbus.h>
> #include <telepathy-glib/enums.h>
> #include <telepathy-glib/errors.h>
>diff --git a/src/muc-channel.c b/src/muc-channel.c
>index 69fd30a..93ab206 100644
>--- a/src/muc-channel.c
>+++ b/src/muc-channel.c
>@@ -29,7 +29,6 @@
> 
> #include <dbus/dbus-glib.h>
> #include <telepathy-glib/dbus.h>
>-#include <telepathy-glib/debug-ansi.h>
> #include <telepathy-glib/errors.h>
> #include <telepathy-glib/exportable-channel.h>
> #include <telepathy-glib/gtypes.h>
>@@ -3324,8 +3323,7 @@ request_config_form_reply_cb (
>     {
>       GString *unsubstituted = g_string_new ("");
> 
>-      printf (TP_ANSI_BOLD_ON TP_ANSI_FG_WHITE TP_ANSI_BG_RED
>-              "\n%s: the following properties were not substituted:\n",
>+      printf ("\n%s: the following properties were not substituted:\n",
>               G_STRFUNC);
> 
>       for (i = 0; i < TP_NUM_BASE_ROOM_CONFIG_PROPERTIES; i++)
>@@ -3345,7 +3343,7 @@ request_config_form_reply_cb (
> 
>       printf ("\nthis is a MUC server compatibility bug in gabble, please "
>               "report it with a full debug log attached (running gabble "
>-              "with WOCKY_DEBUG=xmpp)" TP_ANSI_RESET "\n\n");
>+              "with WOCKY_DEBUG=xmpp)\n\n");
>       fflush (stdout);
> 
>       error = g_error_new (TP_ERRORS, TP_ERROR_SERVICE_CONFUSED,
>-- 
>1.7.10
>

Actions: View | Splinter Review

Attachments on bug 49384: 61027 | 61028 | 61030 | 61031 | 61032 | 61033 | 61034 | 61035 | 61036 | 62274 | 62275 | 62276 | 62277 | 62278 | 62279 | 62280 | 62525 | 62526 | 62527 | 62528 | 62529 | 62530 | 62531

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.