[Xfce4-commits] <xfce4-panel:master> Only return default title in applications menu is NULL.

[Nick Schermer]

Updating branch refs/heads/master
         to 11d9a17c60349d5f584ca1c6847f2fdc704ff72e (commit)
       from f19e14c93783673cdb432ee18661dcc0003c1aca (commit)

commit 11d9a17c60349d5f584ca1c6847f2fdc704ff72e
Author: Nick Schermer <nick at xfce.org>
Date:   Fri Mar 5 22:20:05 2010 +0100

    Only return default title in applications menu is NULL.

 plugins/applicationsmenu/applicationsmenu.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/applicationsmenu/applicationsmenu.c b/plugins/applicationsmenu/applicationsmenu.c
index 35e273b..0e1123c 100644
--- a/plugins/applicationsmenu/applicationsmenu.c
+++ b/plugins/applicationsmenu/applicationsmenu.c
@@ -256,7 +256,7 @@ applications_menu_plugin_get_property (GObject    *object,
       break;
 
     case PROP_BUTTON_TITLE:
-      g_value_set_string (value, exo_str_is_empty (plugin->button_title) ?
+      g_value_set_string (value, plugin->button_title == NULL ?
           DEFAULT_TITLE : plugin->button_title);
       break;
 
@@ -318,7 +318,8 @@ applications_menu_plugin_set_property (GObject      *object,
       plugin->button_title = g_value_dup_string (value);
       gtk_label_set_text (GTK_LABEL (plugin->label),
           plugin->button_title != NULL ? plugin->button_title : "");
-      gtk_widget_set_tooltip_text (plugin->button, plugin->button_title);
+      gtk_widget_set_tooltip_text (plugin->button,
+          exo_str_is_empty (plugin->button_title) ? NULL : plugin->button_title);
       break;
 
     case PROP_BUTTON_ICON: