From c558cdb97fb485d0dc4bca44434be8bf4afae572 Mon Sep 17 00:00:00 2001
From: Mikkel Kamstrup Erlandsen <mikkel.kamstrup@gmail.com>
Date: Tue, 1 Feb 2011 14:13:18 +0100
Subject: Lax overly strict DBus name checking in
 LauncherEntryRemote::SetQuicklist()

(bzr r798.5.11)
---
 src/LauncherEntryRemote.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/LauncherEntryRemote.cpp b/src/LauncherEntryRemote.cpp
index d5bce613a..90cc6e10d 100644
--- a/src/LauncherEntryRemote.cpp
+++ b/src/LauncherEntryRemote.cpp
@@ -302,7 +302,7 @@ LauncherEntryRemote::SetQuicklist(DbusmenuClient *quicklist)
           g_object_get (quicklist, DBUSMENU_CLIENT_PROP_DBUS_NAME, &new_ql_name, NULL);
         }
 
-      if (g_strcmp0 (new_ql_name, _dbus_name) != 0)
+      if (quicklist != NULL && g_strcmp0 (new_ql_name, _dbus_name) != 0)
         {
           g_critical ("Mismatch between quicklist- and launcher entry owner:"
                       "%s and %s respectively", new_ql_name, _dbus_name);
-- 
cgit v1.2.3