[Xfce4-commits] <libxfce4ui:new-sm-client> don't try to call g_set_application_name() if it's already set

Brian J. Tarricone noreply at xfce.org
Mon Oct 5 22:40:01 CEST 2009


Updating branch refs/heads/kelnos/new-sm-client
         to b2598aef0fb1dbe516a6746ec2da4b919543589b (commit)
       from 5699458f827e758aa087e4796db5764778bac5aa (commit)

commit b2598aef0fb1dbe516a6746ec2da4b919543589b
Author: Brian J. Tarricone <brian at tarricone.org>
Date:   Mon Oct 5 13:03:17 2009 -0700

    don't try to call g_set_application_name() if it's already set

 libxfce4ui/xfce-sm-client.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/libxfce4ui/xfce-sm-client.c b/libxfce4ui/xfce-sm-client.c
index 888a711..bca246d 100644
--- a/libxfce4ui/xfce-sm-client.c
+++ b/libxfce4ui/xfce-sm-client.c
@@ -1815,9 +1815,11 @@ xfce_sm_client_set_desktop_file(XfceSMClient *sm_client,
 
     xfce_rc_set_group(rcfile, "Desktop Entry");
 
-    name = xfce_rc_read_entry(rcfile, "Name", NULL);
-    if(name)
-        g_set_application_name(name);
+    if(!g_get_application_name()) {
+        name = xfce_rc_read_entry(rcfile, "Name", NULL);
+        if(name)
+            g_set_application_name(name);
+    }
 
     icon = xfce_rc_read_entry(rcfile, "Icon", NULL);
     if(icon) {



More information about the Xfce4-commits mailing list