diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | src/messages-service.c | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index dd966be..d5b39c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -indicator-messages (0.2.0~bzr121-0ubuntu3~ppa2~dirwatch1) karmic; urgency=low +indicator-messages (0.2.0~bzr126-0ubuntu1~ppa1) UNRELEASED; urgency=low - * Updated from the dirwatch branch + * Merging in upstream version with launchers, blacklists and + directory watches. - -- Ted Gould <ted@ubuntu.com> Sat, 22 Aug 2009 13:02:44 -0500 + -- Ted Gould <ted@ubuntu.com> Tue, 25 Aug 2009 16:08:26 -0500 indicator-messages (0.2.0~bzr121-0ubuntu3~ppa1) karmic; urgency=low diff --git a/src/messages-service.c b/src/messages-service.c index 384198a..e4982a2 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -195,7 +195,7 @@ blacklist_init (gpointer data) GError * error = NULL; GDir * dir = g_dir_open(blacklistdir, 0, &error); if (dir == NULL) { - g_warning("Unable to open blacklist directory (%s): %s", blacklistdir, error->message); + g_warning("Unable to open blacklist directory (%s): %s", blacklistdir, error == NULL ? "No Message" : error->message); g_error_free(error); g_free(blacklistdir); return FALSE; |