aboutsummaryrefslogtreecommitdiff
path: root/src/datetime-service.c
diff options
context:
space:
mode:
authorkarl-qdh <karl@qdh.org.uk>2011-03-04 10:07:26 +0000
committerkarl-qdh <karl@qdh.org.uk>2011-03-04 10:07:26 +0000
commit4af06d0358a5d260461a224069fa3b7667e0a67a (patch)
tree396214cd106fd1f410966e46ee172af6e97edb7a /src/datetime-service.c
parent3f720df7d704855d1742314304ad8c519a739d09 (diff)
parent8a5b40e906646c1b3616855ed8b04f3e4283a604 (diff)
downloadayatana-indicator-datetime-4af06d0358a5d260461a224069fa3b7667e0a67a.tar.gz
ayatana-indicator-datetime-4af06d0358a5d260461a224069fa3b7667e0a67a.tar.bz2
ayatana-indicator-datetime-4af06d0358a5d260461a224069fa3b7667e0a67a.zip
Merging back with trunk
Diffstat (limited to 'src/datetime-service.c')
-rw-r--r--src/datetime-service.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/datetime-service.c b/src/datetime-service.c
index cae2a76..eff3bf6 100644
--- a/src/datetime-service.c
+++ b/src/datetime-service.c
@@ -47,7 +47,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
#include <libical/icaltime.h>
#include <cairo/cairo.h>
-
#include <oobs/oobs-timeconfig.h>
#include "datetime-interface.h"
@@ -137,7 +136,7 @@ check_timezone_sync (void) {
} else {
g_debug("Timezones are different");
}
-
+
gboolean show = g_settings_get_boolean (conf, SETTINGS_SHOW_LOCATIONS_S);
if (geo_location != NULL && current_location != NULL) {
@@ -384,6 +383,7 @@ update_timezone_menu_items(gpointer user_data) {
g_debug("Updating timezone menu items");
gchar ** locations = g_settings_get_strv(conf, SETTINGS_LOCATIONS_S);
+
if (locations == NULL) {
g_debug("No locations configured (NULL)");
return FALSE;