diff options
| author | Ted Gould <ted@gould.cx> | 2010-01-06 23:23:57 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-01-06 23:23:57 -0600 |
| commit | 7cc64514915d81fe6420990571eb5bfcdd437449 (patch) | |
| tree | faa7bdb69623910ab3cc9ba78640d3b20f3f1a3d | |
| parent | 376a22af7dc52b6f53b1bd543ea8af9a3add277f (diff) | |
| parent | 2e2d1894a25c8d49a9cec7c0295f43c930a175cf (diff) | |
| download | libdbusmenu-7cc64514915d81fe6420990571eb5bfcdd437449.tar.gz libdbusmenu-7cc64514915d81fe6420990571eb5bfcdd437449.tar.bz2 libdbusmenu-7cc64514915d81fe6420990571eb5bfcdd437449.zip | |
* Upstream update:
* Look for NULL strings instead of NULL pointers
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | libdbusmenu-glib/client.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 40ca049..779b921 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdbusmenu (0.2.0~dev-0ubuntu1~ppa8~light4) UNRELEASED; urgency=low + + * Upstream update: + * Look for NULL strings instead of NULL pointers + + -- Ted Gould <ted@ubuntu.com> Wed, 06 Jan 2010 23:23:29 -0600 + libdbusmenu (0.2.0~dev-0ubuntu1~ppa8~light3) karmic; urgency=low * Upstream update: diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index dc1da4e..675a01d 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -369,7 +369,7 @@ dbus_owner_change (DBusGProxy * proxy, const gchar * name, const gchar * prev, c DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client); g_debug("Owner change: %s %s %s", name, prev, new); - if (!(new != NULL && prev == NULL)) { + if (!(new[0] != '\0' && prev[0] == '\0')) { /* If it's not someone new getting on the bus, sorry we simply just don't care. It's not that your service isn't important to someone, just not us. You'll find the right |