← Back to branch summary

~wmills/ubuntu/lucid/gnome-terminal/proxy-wget-fix

« back to all changes in this revision

Viewing changes to src/terminal-encoding.c

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2009-01-11 21:42:27 UTC
  • mfrom: (1.3.26 upstream)
  • Revision ID: james.westby@ubuntu.com-20090111214227-urxhqpk82v6ja54u
Tags: 2.25.3-0ubuntu1
https://launchpad.net/bugs/316186
https://launchpad.net/bugs/212761
https://launchpad.net/bugs/298426
https://launchpad.net/bugs/258775
https://launchpad.net/bugs/279046
https://launchpad.net/bugs/290777
https://launchpad.net/bugs/194065
* New upstream version (LP: #316186):
  - Now uses DBus for single instance/factory setup
  - Bugs fixed (LP: #212761, LP: #298426, LP: #258775,
    LP: #279046, LP: #290777, LP: #194065).
* debian/control{.in}:
  - Bumped build-dependency on libvte-dev to 1:0.19.1.
  - Dropped build-dependency on libgnomeui-dev.
  - Added build-dependency on libdbus-glib-1-dev (>= 0.6).
  - Dropped build-dependency on libxft-dev, as the xft VTE
    backend has gone.
* debian/patches/01_lpi.patch:
  - New version update.
* Dropped 05_restore_tab_switching_shortcuts.patch:
  - Merged upstream.
* debian/patches/99_autoreconf.patch:
  - New version update.
* debian/copyright:
  - Updated authors.
* debian/gnome-terminal-data.install:
  - Don't try to install /usr/lib/bonobo, as it no longer exists.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/terminal-encoding.c
22
22
 
23
23
#include <gtk/gtk.h>
24
24
 
 
25
#include "terminal-app.h"
 
26
#include "terminal-debug.h"
25
27
#include "terminal-encoding.h"
26
 
#include "terminal-app.h"
27
28
#include "terminal-intl.h"
28
29
#include "terminal-profile.h"
29
30
#include "terminal-util.h"
209
210
                    (converted != NULL) &&
210
211
                    (strcmp (converted, ascii_sample) == 0);
211
212
 
212
 
#ifdef DEBUG_ENCODINGS
213
 
  if (!encoding->valid)
214
 
    {
215
 
      g_print("Rejecting encoding %s as invalid:\n", encoding->charset);
216
 
      g_print(" input  \"%s\"\n", ascii_sample);
217
 
      g_print(" output \"%s\" bytes read %u written %u\n",
218
 
              converted ? converted : "(null)", bytes_read, bytes_written);
219
 
      if (error)
220
 
        g_print (" Error: %s\n", error->message);
221
 
      g_print ("\n");
222
 
    }
223
 
  else
224
 
    g_print ("Encoding %s is valid\n\n", encoding->charset);
 
213
#ifdef GNOME_ENABLE_DEBUG
 
214
  _TERMINAL_DEBUG_IF (TERMINAL_DEBUG_ENCODINGS)
 
215
  {
 
216
    if (!encoding->valid)
 
217
      {
 
218
        _terminal_debug_print (TERMINAL_DEBUG_ENCODINGS,
 
219
                               "Rejecting encoding %s as invalid:\n",
 
220
                               encoding->charset);
 
221
        _terminal_debug_print (TERMINAL_DEBUG_ENCODINGS,
 
222
                               " input  \"%s\"\n",
 
223
                               ascii_sample);
 
224
        _terminal_debug_print (TERMINAL_DEBUG_ENCODINGS,
 
225
                               " output \"%s\" bytes read %u written %u\n",
 
226
                               converted ? converted : "(null)", bytes_read, bytes_written);
 
227
        if (error)
 
228
          _terminal_debug_print (TERMINAL_DEBUG_ENCODINGS,
 
229
                                 " Error: %s\n",
 
230
                                 error->message);
 
231
      }
 
232
    else
 
233
        _terminal_debug_print (TERMINAL_DEBUG_ENCODINGS,
 
234
                               "Encoding %s is valid\n\n",
 
235
                               encoding->charset);
 
236
  }
225
237
#endif
226
238
 
227
239
  g_clear_error (&error);