gnome-terminal r3395 - trunk/src

[behdad svn gnome org]

Author: behdad
Date: Thu Mar 26 18:05:09 2009
New Revision: 3395
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=3395&view=rev

Log:
Minor fixes from Richard Russon


Modified:
   trunk/src/eggsmclient-xsmp.c
   trunk/src/terminal-accels.c
   trunk/src/terminal-accels.h
   trunk/src/terminal-app.h
   trunk/src/terminal-util.c

Modified: trunk/src/eggsmclient-xsmp.c
==============================================================================
--- trunk/src/eggsmclient-xsmp.c	(original)
+++ trunk/src/eggsmclient-xsmp.c	Thu Mar 26 18:05:09 2009
@@ -1328,6 +1328,7 @@
 
     default:
       g_assert_not_reached ();
+      return FALSE;
     }
 }
 

Modified: trunk/src/terminal-accels.c
==============================================================================
--- trunk/src/terminal-accels.c	(original)
+++ trunk/src/terminal-accels.c	Thu Mar 26 18:05:09 2009
@@ -335,6 +335,8 @@
           gconf_client_notify (conf, key_entry->gconf_key);
 	}
     }
+
+  g_object_unref (conf);
   
   g_signal_connect (notification_group, "accel-changed",
                     G_CALLBACK (accel_changed_callback), NULL);

Modified: trunk/src/terminal-accels.h
==============================================================================
--- trunk/src/terminal-accels.h	(original)
+++ trunk/src/terminal-accels.h	Thu Mar 26 18:05:09 2009
@@ -21,7 +21,6 @@
 #define TERMINAL_ACCELS_H
 
 #include <gtk/gtk.h>
-#include <gconf/gconf-client.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/src/terminal-app.h
==============================================================================
--- trunk/src/terminal-app.h	(original)
+++ trunk/src/terminal-app.h	Thu Mar 26 18:05:09 2009
@@ -69,8 +69,6 @@
 #define TERMINAL_APP_ENABLE_MNEMONICS       "enable-mnemonics"
 #define TERMINAL_APP_SYSTEM_FONT            "system-font"
 
-#define EPSILON (1.0e-6)
-
 /* TerminalApp */
 
 #define TERMINAL_TYPE_APP              (terminal_app_get_type ())

Modified: trunk/src/terminal-util.c
==============================================================================
--- trunk/src/terminal-util.c	(original)
+++ trunk/src/terminal-util.c	Thu Mar 26 18:05:09 2009
@@ -32,8 +32,6 @@
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 
-#include <gconf/gconf-client.h>
-
 #include "terminal-accels.h"
 #include "terminal-app.h"
 #include "terminal-intl.h"