diff options
| author | Ted Gould <ted@gould.cx> | 2010-08-11 09:07:42 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-08-11 09:07:42 -0500 |
| commit | 3e415d534a762f91df41222d473354f1062bd17d (patch) | |
| tree | d3e89aa6d9bdfc94b7e00ee7eee41a7f8b0d1d84 | |
| parent | bceb5ace37cf6b0de1c41525610824fd77f71334 (diff) | |
| parent | 77343b7e956416b2d2a8e45b5a2a2e683e1ed836 (diff) | |
| download | libayatana-appindicator-3e415d534a762f91df41222d473354f1062bd17d.tar.gz libayatana-appindicator-3e415d534a762f91df41222d473354f1062bd17d.tar.bz2 libayatana-appindicator-3e415d534a762f91df41222d473354f1062bd17d.zip | |
* Upstream Merge
* Checking to make sure we get a list of keys before using
them.
* Fixing typo for group name in overrides file.
| -rw-r--r-- | data/ordering-override.keyfile | 2 | ||||
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | src/application-service-appstore.c | 9 |
3 files changed, 18 insertions, 2 deletions
diff --git a/data/ordering-override.keyfile b/data/ordering-override.keyfile index 6665b7a..dcfb75b 100644 --- a/data/ordering-override.keyfile +++ b/data/ordering-override.keyfile @@ -1,2 +1,2 @@ -[Ordering Index Overides] +[Ordering Index Overrides] gnome-power-manager=1 diff --git a/debian/changelog b/debian/changelog index 4534043..9a47422 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +indicator-application (0.2.3-0ubuntu2~ppa5~order3) UNRELEASED; urgency=low + + * Upstream Merge + * Checking to make sure we get a list of keys before using + them. + * Fixing typo for group name in overrides file. + + -- Ted Gould <ted@ubuntu.com> Wed, 11 Aug 2010 09:06:58 -0500 + indicator-application (0.2.3-0ubuntu2~ppa5~order2) maverick; urgency=low * Upstream Merge diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c index d632456..2306230 100644 --- a/src/application-service-appstore.c +++ b/src/application-service-appstore.c @@ -273,7 +273,14 @@ load_override_file (GHashTable * hash, const gchar * filename) return; } - gchar ** keys = g_key_file_get_keys(keyfile, OVERRIDE_GROUP_NAME, NULL, NULL); + gchar ** keys = g_key_file_get_keys(keyfile, OVERRIDE_GROUP_NAME, NULL, &error); + if (error != NULL) { + g_warning("Unable to get keys from keyfile '%s' because: %s", filename, error->message); + g_error_free(error); + g_key_file_free(keyfile); + return; + } + gchar * key = keys[0]; gint i; |