← Back to branch summary

~ubuntu-branches/ubuntu/lucid/gnome-terminal/lucid-updates

« back to all changes in this revision

Viewing changes to src/terminal-accels.c

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2009-04-28 12:07:18 UTC
  • mfrom: (1.3.30 upstream)
  • Revision ID: james.westby@ubuntu.com-20090428120718-vfcpzs27egrtr0dy
Tags: 2.26.1-0ubuntu1
https://launchpad.net/bugs/361053
https://launchpad.net/bugs/333603
https://launchpad.net/bugs/331295
* New upstream release: (LP: #361053)
  - Make gnome-terminal session loading work (LP: #333603)
  - Missing translator comment
  - gnome terminal treats pixelsized fonts point sized
  - Use of uninitialized variables
  - gnome-terminal crashed with SIGSEGV in gtk_ui_manager_remove_ui()
  - Update to GNOME Help Centre OMF Files
  - Translation update
  - 'Close this terminal' warning labels button as 'Close Window'
    (LP: #331295)
* debian/control.in:
  - bump libgtk2.0-dev to 2.14.0
  - bump libvte-dev to 0.20.0
  - re-generate debian/control
* remove debian/patches/30_honour_point_pixel_sizes.patch, the change
  is in the tarball
* re-generate debian/patches/99_autoreconf.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/terminal-accels.c
404
404
  val = gconf_entry_get_value (entry);
405
405
 
406
406
#ifdef GNOME_ENABLE_DEBUG
407
 
  _TERMINAL_DEBUG_IF (TERMINAL_DEBUG_GEOMETRY)
 
407
  _TERMINAL_DEBUG_IF (TERMINAL_DEBUG_ACCELS)
408
408
    {
409
409
      if (val == NULL)
410
410
        _terminal_debug_print (TERMINAL_DEBUG_ACCELS, " changed to be unset\n");
770
770
                         gdk_keyval_name (keyval) ? gdk_keyval_name (keyval) : "null",
771
771
                         str);
772
772
#ifdef GNOME_ENABLE_DEBUG
773
 
  _TERMINAL_DEBUG_IF (TERMINAL_DEBUG_GEOMETRY)
 
773
  _TERMINAL_DEBUG_IF (TERMINAL_DEBUG_ACCELS)
774
774
    {
775
775
      GtkAccelKey old_key;
776
776
 
938
938
  tree = edit_keys_store = gtk_tree_store_new (N_COLUMNS, G_TYPE_STRING, G_TYPE_POINTER);
939
939
 
940
940
#ifdef GNOME_ENABLE_DEBUG
941
 
  _TERMINAL_DEBUG_IF (TERMINAL_DEBUG_GEOMETRY)
 
941
  _TERMINAL_DEBUG_IF (TERMINAL_DEBUG_ACCELS)
942
942
    g_signal_connect (tree, "row-changed", G_CALLBACK (row_changed), NULL);
943
943
#endif
944
944