[Goodies-commits] r1866 - in verve-plugin/trunk: . panel-plugin scripts

[Jannis Pohlmann]

Author: jannis
Date: 2006-08-08 20:35:25 +0000 (Tue, 08 Aug 2006)
New Revision: 1866

Modified:
   verve-plugin/trunk/ChangeLog
   verve-plugin/trunk/configure.in.in
   verve-plugin/trunk/panel-plugin/verve-plugin.c
   verve-plugin/trunk/scripts/verve-focus.c
Log:
	* scripts/verve-focus.c: Check if objects are != NULL before
	  unref'ing them. This fixes bug #2125 as reported by
	  huggie at earth.li.
	* panel-plugin/verve-plugin.c: Unhide the panel when Verve grabs
	  the focus. Re-hide it after a command was successfully
	  started.
	* configure.in.in: Depend on version 4.3.90.2svn-22691 of the
	  panel when the xfce_panel_plugin_set_hidden was introduced.

Modified: verve-plugin/trunk/ChangeLog
===================================================================
--- verve-plugin/trunk/ChangeLog	2006-08-08 17:21:54 UTC (rev 1865)
+++ verve-plugin/trunk/ChangeLog	2006-08-08 20:35:25 UTC (rev 1866)
@@ -1,3 +1,14 @@
+2006-08-08	Jannis Pohlmann <jannis at xfce.org>
+
+	* scripts/verve-focus.c: Check if objects are != NULL before
+	  unref'ing them. This fixes bug #2125 as reported by
+	  huggie at earth.li.
+	* panel-plugin/verve-plugin.c: Unhide the panel when Verve grabs
+	  the focus. Re-hide it after a command was successfully
+	  started.
+	* configure.in.in: Depend on version 4.3.90.2svn-22691 of the
+	  panel when the xfce_panel_plugin_set_hidden was introduced.
+
 2006-08-02	Jannis Pohlmann <jannis at xfce.org>
 
 	* configure.in.in, po/*.po: Version 0.3.4 released, which fixes

Modified: verve-plugin/trunk/configure.in.in
===================================================================
--- verve-plugin/trunk/configure.in.in	2006-08-08 17:21:54 UTC (rev 1865)
+++ verve-plugin/trunk/configure.in.in	2006-08-08 20:35:25 UTC (rev 1866)
@@ -53,7 +53,7 @@
 dnl *** Check for required packages ***
 dnl ***********************************
 XDT_CHECK_PACKAGE([LIBEXO], [exo-0.3], [0.3.1.3])
-XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.28])
+XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.90.2svn-22691])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.0])
 XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.6.4])
 XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.4])

Modified: verve-plugin/trunk/panel-plugin/verve-plugin.c
===================================================================
--- verve-plugin/trunk/panel-plugin/verve-plugin.c	2006-08-08 17:21:54 UTC (rev 1865)
+++ verve-plugin/trunk/panel-plugin/verve-plugin.c	2006-08-08 20:35:25 UTC (rev 1866)
@@ -235,6 +235,9 @@
 
   if (toplevel && toplevel->window)
     {
+      /* Unhide the panel */
+      xfce_panel_plugin_set_panel_hidden (verve->plugin, FALSE);
+
       /* Focus the command entry */
       xfce_panel_plugin_focus_widget (verve->plugin, verve->input);
       
@@ -248,7 +251,7 @@
 
 
 static gboolean 
-verve_plugin_keypress_cb (GtkWidget *entry, 
+verve_plugin_keypress_cb (GtkWidget   *entry, 
                           GdkEventKey *event, 
                           VervePlugin *verve)
 {
@@ -378,6 +381,9 @@
         /* Try executing the command */
         if (G_LIKELY (verve_execute (command, terminal)))
           {
+            /* Hide the panel again */
+            xfce_panel_plugin_set_panel_hidden (verve->plugin, TRUE);
+
             /* Do not add command to history if it is the same as the one before */
             if (verve_history_is_empty () || g_utf8_collate (verve_history_get_last_command (), command) != 0)
               {

Modified: verve-plugin/trunk/scripts/verve-focus.c
===================================================================
--- verve-plugin/trunk/scripts/verve-focus.c	2006-08-08 17:21:54 UTC (rev 1865)
+++ verve-plugin/trunk/scripts/verve-focus.c	2006-08-08 20:35:25 UTC (rev 1866)
@@ -74,7 +74,8 @@
   result = dbus_connection_send_with_reply_and_block (connection, method, 5000, &error);
 
   /* Destroy sent message */
-  dbus_message_unref (method);
+  if (G_LIKELY (method != NULL))
+    dbus_message_unref (method);
 
   /* Handle method send error */
   if (G_UNLIKELY (result == NULL))
@@ -92,10 +93,12 @@
     exit_status = EXIT_SUCCESS;
 
   /* Destroy result */
-  dbus_message_unref (result);
+  if (G_LIKELY (result != NULL))
+    dbus_message_unref (result);
 
   /* Disconnect from session bus */
-  dbus_connection_unref (connection);
+  if (G_LIKELY (connection != NULL))
+    dbus_connection_unref (connection);
 
   return exit_status;
 }