From 9485b01a79c5a7ebe563986295acf24f6ce7df1a Mon Sep 17 00:00:00 2001 From: karl-qdh Date: Sun, 6 Mar 2011 14:28:05 +0000 Subject: Hooking up the signals from the calendar and getting it working on service side --- src/indicator-datetime.c | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) (limited to 'src/indicator-datetime.c') diff --git a/src/indicator-datetime.c b/src/indicator-datetime.c index 7953883..0d10579 100644 --- a/src/indicator-datetime.c +++ b/src/indicator-datetime.c @@ -1102,6 +1102,9 @@ indicator_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GVariant *value, ido_calendar_menu_item_unmark_day (IDO_CALENDAR_MENU_ITEM (mi_data), g_variant_get_int16(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)) { + // TODO This needs to be an array of 3 ints + //ido_calendar_menu_item_set_date (IDO_CALENDAR_MENU_ITEM (mi_data), ); } else { g_warning("Indicator Item property '%s' unknown", prop); } @@ -1196,10 +1199,42 @@ month_changed_cb (IdoCalendarMenuItem *ido, g_sprintf(datestring, "%d-%d-%d", y, m, d); GVariant *variant = g_variant_new_string(datestring); guint timestamp = (guint)time(NULL); - dbusmenu_menuitem_handle_event(DBUSMENU_MENUITEM(item), "event::month-changed", variant, timestamp); + dbusmenu_menuitem_handle_event(DBUSMENU_MENUITEM(item), "month-changed", variant, timestamp); g_debug("Got month changed signal: %s", datestring); } +static void +day_selected_cb (IdoCalendarMenuItem *ido, + guint day, + gpointer user_data) +{ + gchar datestring[20]; + guint d,m,y; + DbusmenuMenuitem * item = DBUSMENU_MENUITEM (user_data); + ido_calendar_menu_item_get_date(ido, &y, &m, &d); + g_sprintf(datestring, "%d-%d-%d", y, m, d); + GVariant *variant = g_variant_new_string(datestring); + guint timestamp = (guint)time(NULL); + dbusmenu_menuitem_handle_event(DBUSMENU_MENUITEM(item), "day-selected", variant, timestamp); + g_debug("Got day-selected signal: %s", datestring); +} + +static void +day_selected_double_click_cb (IdoCalendarMenuItem *ido, + guint day, + gpointer user_data) +{ + gchar datestring[20]; + guint d,m,y; + DbusmenuMenuitem * item = DBUSMENU_MENUITEM (user_data); + ido_calendar_menu_item_get_date(ido, &y, &m, &d); + g_sprintf(datestring, "%d-%d-%d", y, m, d); + GVariant *variant = g_variant_new_string(datestring); + guint timestamp = (guint)time(NULL); + dbusmenu_menuitem_handle_event(DBUSMENU_MENUITEM(item), "day-selected-double-click", variant, timestamp); + g_debug("Got day-selected-double-click signal: %s", datestring); +} + static gboolean new_calendar_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, @@ -1231,6 +1266,11 @@ new_calendar_item (DbusmenuMenuitem * newitem, dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, GTK_MENU_ITEM(ido), parent); g_signal_connect_after(ido, "month-changed", G_CALLBACK(month_changed_cb), (gpointer)newitem); + dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, GTK_MENU_ITEM(ido), parent); + g_signal_connect_after(ido, "day-selected", G_CALLBACK(day_selected_cb), (gpointer)newitem); + dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, GTK_MENU_ITEM(ido), parent); + g_signal_connect_after(ido, "day-selected-double-click", G_CALLBACK(day_selected_double_click_cb), (gpointer)newitem); + return TRUE; } -- cgit v1.2.3 From 7823baf6ae4d84d7796bd003f2c3f0bb0122d126 Mon Sep 17 00:00:00 2001 From: karl-qdh Date: Sun, 6 Mar 2011 17:08:13 +0000 Subject: Tried using uint but still segfaulting in variant code --- src/indicator-datetime.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/indicator-datetime.c') diff --git a/src/indicator-datetime.c b/src/indicator-datetime.c index 0d10579..944b33d 100644 --- a/src/indicator-datetime.c +++ b/src/indicator-datetime.c @@ -1197,7 +1197,14 @@ month_changed_cb (IdoCalendarMenuItem *ido, DbusmenuMenuitem * item = DBUSMENU_MENUITEM (user_data); ido_calendar_menu_item_get_date(ido, &y, &m, &d); g_sprintf(datestring, "%d-%d-%d", y, m, d); - GVariant *variant = g_variant_new_string(datestring); + struct tm date; + date.tm_mday = d; + date.tm_mon = m; + date.tm_year = y; + date.tm_hour = 0; + date.tm_min = 0; + guint selecteddate = (guint)mktime(&date); + GVariant *variant = g_variant_new_uint32(selecteddate); guint timestamp = (guint)time(NULL); dbusmenu_menuitem_handle_event(DBUSMENU_MENUITEM(item), "month-changed", variant, timestamp); g_debug("Got month changed signal: %s", datestring); -- cgit v1.2.3 From 3bd841330e0299c54031218e3fc20f911ba7e952 Mon Sep 17 00:00:00 2001 From: karl-qdh Date: Tue, 8 Mar 2011 13:18:50 +0000 Subject: Fixed incorrect year in tm struct for indicator-datetime.c:month_changed_cb, still receiving a segfault in datetime-service.c when we try to use the variant. Checked the variant value over dbus and its fine. --- src/indicator-datetime.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'src/indicator-datetime.c') diff --git a/src/indicator-datetime.c b/src/indicator-datetime.c index 944b33d..86eeed6 100644 --- a/src/indicator-datetime.c +++ b/src/indicator-datetime.c @@ -1192,24 +1192,21 @@ static void month_changed_cb (IdoCalendarMenuItem *ido, gpointer user_data) { - gchar datestring[20]; guint d,m,y; DbusmenuMenuitem * item = DBUSMENU_MENUITEM (user_data); ido_calendar_menu_item_get_date(ido, &y, &m, &d); - g_sprintf(datestring, "%d-%d-%d", y, m, d); - struct tm date; + struct tm date = {0}; date.tm_mday = d; - date.tm_mon = m; - date.tm_year = y; - date.tm_hour = 0; - date.tm_min = 0; + date.tm_mon = m + 1; // Month is always off by one + date.tm_year = y - 1900; guint selecteddate = (guint)mktime(&date); + g_debug("Got month changed signal: %s", asctime(&date)); + g_debug("Selected date %d from %d-%d-%d", selecteddate, d, m, y); GVariant *variant = g_variant_new_uint32(selecteddate); guint timestamp = (guint)time(NULL); dbusmenu_menuitem_handle_event(DBUSMENU_MENUITEM(item), "month-changed", variant, timestamp); - g_debug("Got month changed signal: %s", datestring); } - +/* The following needs ido changes to be merged static void day_selected_cb (IdoCalendarMenuItem *ido, guint day, @@ -1241,7 +1238,7 @@ day_selected_double_click_cb (IdoCalendarMenuItem *ido, dbusmenu_menuitem_handle_event(DBUSMENU_MENUITEM(item), "day-selected-double-click", variant, timestamp); g_debug("Got day-selected-double-click signal: %s", datestring); } - +*/ static gboolean new_calendar_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, @@ -1274,9 +1271,9 @@ new_calendar_item (DbusmenuMenuitem * newitem, dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, GTK_MENU_ITEM(ido), parent); g_signal_connect_after(ido, "month-changed", G_CALLBACK(month_changed_cb), (gpointer)newitem); dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, GTK_MENU_ITEM(ido), parent); - g_signal_connect_after(ido, "day-selected", G_CALLBACK(day_selected_cb), (gpointer)newitem); + /*g_signal_connect_after(ido, "day-selected", G_CALLBACK(day_selected_cb), (gpointer)newitem); dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, GTK_MENU_ITEM(ido), parent); - g_signal_connect_after(ido, "day-selected-double-click", G_CALLBACK(day_selected_double_click_cb), (gpointer)newitem); + g_signal_connect_after(ido, "day-selected-double-click", G_CALLBACK(day_selected_double_click_cb), (gpointer)newitem);*/ return TRUE; } -- cgit v1.2.3 From 7d8535da7bd004bf6aa16ea0a52d2a4052614860 Mon Sep 17 00:00:00 2001 From: karl-qdh Date: Tue, 8 Mar 2011 15:44:28 +0000 Subject: Fixed calendar browsing with month-changed and removed bogus off by one error --- src/indicator-datetime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/indicator-datetime.c') diff --git a/src/indicator-datetime.c b/src/indicator-datetime.c index 86eeed6..07be8de 100644 --- a/src/indicator-datetime.c +++ b/src/indicator-datetime.c @@ -1197,7 +1197,7 @@ month_changed_cb (IdoCalendarMenuItem *ido, ido_calendar_menu_item_get_date(ido, &y, &m, &d); struct tm date = {0}; date.tm_mday = d; - date.tm_mon = m + 1; // Month is always off by one + date.tm_mon = m; date.tm_year = y - 1900; guint selecteddate = (guint)mktime(&date); g_debug("Got month changed signal: %s", asctime(&date)); -- cgit v1.2.3 From 3cf4b8aea38d62a047b609d13909d79d5c246d65 Mon Sep 17 00:00:00 2001 From: karl-qdh Date: Mon, 14 Mar 2011 09:59:55 +0000 Subject: Fixing ted's comments --- src/indicator-datetime.c | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) (limited to 'src/indicator-datetime.c') diff --git a/src/indicator-datetime.c b/src/indicator-datetime.c index 07be8de..cf61d25 100644 --- a/src/indicator-datetime.c +++ b/src/indicator-datetime.c @@ -1103,8 +1103,9 @@ 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)) { - // TODO This needs to be an array of 3 ints - //ido_calendar_menu_item_set_date (IDO_CALENDAR_MENU_ITEM (mi_data), ); + gint *array = g_variant_get_fixed_array(value, 3, 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]); } else { g_warning("Indicator Item property '%s' unknown", prop); } @@ -1201,26 +1202,30 @@ month_changed_cb (IdoCalendarMenuItem *ido, date.tm_year = y - 1900; guint selecteddate = (guint)mktime(&date); g_debug("Got month changed signal: %s", asctime(&date)); - g_debug("Selected date %d from %d-%d-%d", selecteddate, d, m, y); GVariant *variant = g_variant_new_uint32(selecteddate); guint timestamp = (guint)time(NULL); dbusmenu_menuitem_handle_event(DBUSMENU_MENUITEM(item), "month-changed", variant, timestamp); } -/* The following needs ido changes to be merged + +// TODO: Needs ido branch merged - lp:~karl-qdh/ido/select-activate-set-date +/* static void day_selected_cb (IdoCalendarMenuItem *ido, guint day, gpointer user_data) { - gchar datestring[20]; guint d,m,y; DbusmenuMenuitem * item = DBUSMENU_MENUITEM (user_data); ido_calendar_menu_item_get_date(ido, &y, &m, &d); - g_sprintf(datestring, "%d-%d-%d", y, m, d); - GVariant *variant = g_variant_new_string(datestring); + struct tm date = {0}; + date.tm_mday = d; + date.tm_mon = m; + date.tm_year = y - 1900; + guint selecteddate = (guint)mktime(&date); + g_debug("Got day selected signal: %s", asctime(&date)); + GVariant *variant = g_variant_new_uint32(selecteddate); guint timestamp = (guint)time(NULL); dbusmenu_menuitem_handle_event(DBUSMENU_MENUITEM(item), "day-selected", variant, timestamp); - g_debug("Got day-selected signal: %s", datestring); } static void @@ -1228,17 +1233,22 @@ day_selected_double_click_cb (IdoCalendarMenuItem *ido, guint day, gpointer user_data) { - gchar datestring[20]; guint d,m,y; DbusmenuMenuitem * item = DBUSMENU_MENUITEM (user_data); ido_calendar_menu_item_get_date(ido, &y, &m, &d); - g_sprintf(datestring, "%d-%d-%d", y, m, d); - GVariant *variant = g_variant_new_string(datestring); + struct tm date = {0}; + date.tm_mday = d; + date.tm_mon = m; + date.tm_year = y - 1900; + guint selecteddate = (guint)mktime(&date); + g_debug("Got day selected double click signal: %s", asctime(&date)); + GVariant *variant = g_variant_new_uint32(selecteddate); guint timestamp = (guint)time(NULL); dbusmenu_menuitem_handle_event(DBUSMENU_MENUITEM(item), "day-selected-double-click", variant, timestamp); - g_debug("Got day-selected-double-click signal: %s", datestring); } */ + + static gboolean new_calendar_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, @@ -1270,9 +1280,9 @@ new_calendar_item (DbusmenuMenuitem * newitem, dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, GTK_MENU_ITEM(ido), parent); g_signal_connect_after(ido, "month-changed", G_CALLBACK(month_changed_cb), (gpointer)newitem); - dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, GTK_MENU_ITEM(ido), parent); + + // TODO: Needs ido branch merged - lp:~karl-qdh/ido/select-activate-set-date /*g_signal_connect_after(ido, "day-selected", G_CALLBACK(day_selected_cb), (gpointer)newitem); - dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, GTK_MENU_ITEM(ido), parent); g_signal_connect_after(ido, "day-selected-double-click", G_CALLBACK(day_selected_double_click_cb), (gpointer)newitem);*/ return TRUE; -- cgit v1.2.3 From 139938582ae1356e2b884d8904da33697bd2bcff Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 14 Mar 2011 21:40:24 -0500 Subject: Commenting out value as we're not using it yet. --- src/indicator-datetime.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/indicator-datetime.c') diff --git a/src/indicator-datetime.c b/src/indicator-datetime.c index d48cb55..83ae161 100644 --- a/src/indicator-datetime.c +++ b/src/indicator-datetime.c @@ -1154,9 +1154,9 @@ 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)); + // const gint * array = g_variant_get_fixed_array(value, NULL, 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 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/indicator-datetime.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/indicator-datetime.c') 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