From 05e4b574ec953bd6b509f0b623de0cf520ce1598 Mon Sep 17 00:00:00 2001 From: karl-qdh Date: Tue, 15 Mar 2011 09:55:23 +0000 Subject: Fixed missed build error, caused by sync problems between netbook and laptop. --- src/datetime-service.c | 6 ++---- src/indicator-datetime.c | 7 ++++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/datetime-service.c b/src/datetime-service.c index 13dc057..62fa435 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -551,7 +551,7 @@ update_appointment_menu_items (gpointer user_data) GSList *g; GError *gerror = NULL; gint i; - gint width, height; + gint width = 0, height = 0; ESourceList * sources = NULL; if (start_time_appointments > 0) @@ -621,9 +621,7 @@ update_appointment_menu_items (gpointer user_data) } } - gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &width, &height); - // Sometimes these give negative numbers, sometimes large numbers which look like timestamps - // is there a buffer overwrite causing it? + gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &width, &height); if (width <= 0) width = 12; if (height <= 0) height = 12; if (width > 30) width = 12; diff --git a/src/indicator-datetime.c b/src/indicator-datetime.c index cf61d25..6f69dac 100644 --- a/src/indicator-datetime.c +++ b/src/indicator-datetime.c @@ -762,7 +762,7 @@ setup_timer (IndicatorDatetime * self, GDateTime * datetime) if (self->priv->show_seconds || (self->priv->time_mode == SETTINGS_TIME_CUSTOM && self->priv->custom_show_seconds)) { - self->priv->timer = g_timeout_add_seconds(1, timer_func, self); + self->priv->timer = g_timeout_add_full(G_PRIORITY_HIGH, 865, timer_func, self, NULL); } else { if (datetime == NULL) { datetime = g_date_time_new_now_local(); @@ -1103,9 +1103,10 @@ indicator_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GVariant *value, } else if (!g_strcmp0(prop, CALENDAR_MENUITEM_PROP_CLEAR_MARKS)) { ido_calendar_menu_item_clear_marks (IDO_CALENDAR_MENU_ITEM (mi_data)); } else if (!g_strcmp0(prop, CALENDAR_MENUITEM_PROP_SET_DATE)) { - gint *array = g_variant_get_fixed_array(value, 3, sizeof(gint)); + gsize size = 3; + const gint * array = g_variant_get_fixed_array(value, &size, sizeof(gint)); // TODO: Needs ido branch merged - lp:~karl-qdh/ido/select-activate-set-date - //ido_calendar_menu_item_set_date (IDO_CALENDAR_MENU_ITEM (mi_data), array[0], array[1], array[2]); + ido_calendar_menu_item_set_date (IDO_CALENDAR_MENU_ITEM (mi_data), array[0], array[1], array[2]); } else { g_warning("Indicator Item property '%s' unknown", prop); } -- cgit v1.2.3 From da12c2831436855897428f7d5063626193d72562 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 16 Mar 2011 16:03:58 -0500 Subject: Updating to required IDO version --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 177c7e2..75d1ff1 100644 --- a/configure.ac +++ b/configure.ac @@ -56,7 +56,7 @@ DBUSMENUGLIB_REQUIRED_VERSION=0.1.1 DBUSMENUGTK_REQUIRED_VERSION=0.3.94 GIO_REQUIRED_VERSION=2.25.11 # Note: the GIO check below also ensures the proper glib with gsettings support is present -INDICATOR_DISPLAY_OBJECTS=0.1.10 +INDICATOR_DISPLAY_OBJECTS=0.2.2 GEOCLUE_REQUIRED_VERSION=0.12.0 OOBS_REQUIRED_VERSION=2.31.0 ECAL_REQUIRED_VERSION=2.30 -- cgit v1.2.3 From 3c59d0869955b4c0698d7a563d712b357e0a2cd9 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 16 Mar 2011 16:04:08 -0500 Subject: 0.1.98 --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 75d1ff1..88c7b20 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(indicator-datetime, 0.1.97, ted@canonical.com) +AC_INIT(indicator-datetime, 0.1.98, ted@canonical.com) AC_COPYRIGHT([Copyright 2009,2010 Canonical]) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-datetime, 0.1.97) +AM_INIT_AUTOMAKE(indicator-datetime, 0.1.98) AM_MAINTAINER_MODE -- cgit v1.2.3