aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2011-03-30 10:29:58 -0500
committerTed Gould <ted@gould.cx>2011-03-30 10:29:58 -0500
commitfb7e5a07951216e5771614b92f4a49f57807b337 (patch)
tree080c1067087995d6066931d8477b00d9fe41a45f /src
parentafdaa937487ff3db6077d851132ea7ae2353bf0f (diff)
downloadayatana-indicator-datetime-fb7e5a07951216e5771614b92f4a49f57807b337.tar.gz
ayatana-indicator-datetime-fb7e5a07951216e5771614b92f4a49f57807b337.tar.bz2
ayatana-indicator-datetime-fb7e5a07951216e5771614b92f4a49f57807b337.zip
Switching to one variable with all the marks in it
Diffstat (limited to 'src')
-rw-r--r--src/datetime-service.c2
-rw-r--r--src/dbus-shared.h4
-rw-r--r--src/indicator-datetime.c15
3 files changed, 3 insertions, 18 deletions
diff --git a/src/datetime-service.c b/src/datetime-service.c
index e284418..ef67d85 100644
--- a/src/datetime-service.c
+++ b/src/datetime-service.c
@@ -860,7 +860,7 @@ update_appointment_menu_items (gpointer user_data)
g_list_free(sorted_comp_instances);
GVariant * marks = g_variant_builder_end (&markeddays);
- dbusmenu_menuitem_property_set_variant (calendar, CALENDAR_MENUITEM_PROP_MARK, marks);
+ dbusmenu_menuitem_property_set_variant (calendar, CALENDAR_MENUITEM_PROP_MARKS, marks);
updating_appointments = FALSE;
g_debug("End of objects");
diff --git a/src/dbus-shared.h b/src/dbus-shared.h
index 8b1a20b..51632f9 100644
--- a/src/dbus-shared.h
+++ b/src/dbus-shared.h
@@ -31,9 +31,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
// The following properties are not *really* properties, but are just
// a way of accessing the calendar from the service
-#define CALENDAR_MENUITEM_PROP_MARK "calendar-mark"
-#define CALENDAR_MENUITEM_PROP_UNMARK "calendar-unmark"
-#define CALENDAR_MENUITEM_PROP_CLEAR_MARKS "calendar-clear-marks"
+#define CALENDAR_MENUITEM_PROP_MARKS "calendar-marks"
#define CALENDAR_MENUITEM_PROP_SET_DATE "calendar-set-date"
diff --git a/src/indicator-datetime.c b/src/indicator-datetime.c
index e55bfa0..b6b8885 100644
--- a/src/indicator-datetime.c
+++ b/src/indicator-datetime.c
@@ -1192,7 +1192,7 @@ static void
calendar_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GVariant *value, IdoCalendarMenuItem * mi_data)
{
g_debug("Changing calendar property");
- if (!g_strcmp0(prop, CALENDAR_MENUITEM_PROP_MARK)) {
+ if (!g_strcmp0(prop, CALENDAR_MENUITEM_PROP_MARKS)) {
ido_calendar_menu_item_clear_marks (IDO_CALENDAR_MENU_ITEM (mi_data));
g_debug("Marks: Cleared");
GVariantIter *iter;
@@ -1204,19 +1204,6 @@ calendar_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GVariant *value, I
g_debug("Marks: Marked day: %d", day);
}
g_variant_iter_free (iter);
- } else if (!g_strcmp0(prop, CALENDAR_MENUITEM_PROP_UNMARK)) {
- GVariantIter *iter;
- gint day;
-
- g_variant_get (value, "ai", &iter);
- while (g_variant_iter_loop (iter, "i", &day)) {
- g_debug("Unmarked day: %d", day);
- ido_calendar_menu_item_unmark_day (IDO_CALENDAR_MENU_ITEM (mi_data), day);
- }
- g_variant_iter_free (iter);
- } else if (!g_strcmp0(prop, CALENDAR_MENUITEM_PROP_CLEAR_MARKS)) {
- ido_calendar_menu_item_clear_marks (IDO_CALENDAR_MENU_ITEM (mi_data));
- g_debug("Cleared Marks");
} else if (!g_strcmp0(prop, CALENDAR_MENUITEM_PROP_SET_DATE)) {
gsize size = 3;
const gint * array = g_variant_get_fixed_array(value, &size, sizeof(gint));