From a7e9eed72ef50398e530784db7e6d91cabbb56aa Mon Sep 17 00:00:00 2001 From: karl-qdh Date: Fri, 25 Feb 2011 09:47:28 +0000 Subject: Added missing getter for calendar display options --- src/idocalendarmenuitem.c | 6 ++++++ src/idocalendarmenuitem.h | 1 + 2 files changed, 7 insertions(+) diff --git a/src/idocalendarmenuitem.c b/src/idocalendarmenuitem.c index 3e326e0..4195da1 100644 --- a/src/idocalendarmenuitem.c +++ b/src/idocalendarmenuitem.c @@ -301,6 +301,12 @@ ido_calendar_menu_item_set_display_options (IdoCalendarMenuItem *menuitem, GtkCa gtk_calendar_set_display_options (GTK_CALENDAR (menuitem->priv->calendar), flags); } +GtkCalendarDisplayOptions +ido_calendar_menu_item_get_display_options (IdoCalendarMenuItem *menuitem) +{ + gtk_calendar_get_display_options (GTK_CALENDAR (menuitem->priv->calendar)); +} + void ido_calendar_menu_item_get_date (IdoCalendarMenuItem *menuitem, guint *year, diff --git a/src/idocalendarmenuitem.h b/src/idocalendarmenuitem.h index 6e9ff9a..22e1008 100644 --- a/src/idocalendarmenuitem.h +++ b/src/idocalendarmenuitem.h @@ -60,6 +60,7 @@ gboolean ido_calendar_menu_item_mark_day (IdoCalendarMenuItem *menui gboolean ido_calendar_menu_item_unmark_day (IdoCalendarMenuItem *menuitem, guint day); void ido_calendar_menu_item_clear_marks (IdoCalendarMenuItem *menuitem); void ido_calendar_menu_item_set_display_options (IdoCalendarMenuItem *menuitem, GtkCalendarDisplayOptions flags); +GtkCalendarDisplayOptions ido_calendar_menu_item_get_display_options (IdoCalendarMenuItem *menuitem); void ido_calendar_menu_item_get_date (IdoCalendarMenuItem *menuitem, guint *year, guint *month, -- cgit v1.2.3 From ae4456bf22db293559fc5e9e90ea45484e08711f Mon Sep 17 00:00:00 2001 From: karl-qdh Date: Fri, 25 Feb 2011 13:13:55 +0000 Subject: Gmf. --- src/idocalendarmenuitem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/idocalendarmenuitem.c b/src/idocalendarmenuitem.c index 4195da1..4fa0061 100644 --- a/src/idocalendarmenuitem.c +++ b/src/idocalendarmenuitem.c @@ -304,7 +304,7 @@ ido_calendar_menu_item_set_display_options (IdoCalendarMenuItem *menuitem, GtkCa GtkCalendarDisplayOptions ido_calendar_menu_item_get_display_options (IdoCalendarMenuItem *menuitem) { - gtk_calendar_get_display_options (GTK_CALENDAR (menuitem->priv->calendar)); + return gtk_calendar_get_display_options (GTK_CALENDAR (menuitem->priv->calendar)); } void -- cgit v1.2.3 From acbbf01f8ad7b09e618227449a041cc4d0b9e267 Mon Sep 17 00:00:00 2001 From: karl-qdh Date: Fri, 25 Feb 2011 15:25:47 +0000 Subject: Added return if fails to public api --- src/idocalendarmenuitem.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/idocalendarmenuitem.c b/src/idocalendarmenuitem.c index 4fa0061..ba46ae2 100644 --- a/src/idocalendarmenuitem.c +++ b/src/idocalendarmenuitem.c @@ -280,30 +280,41 @@ ido_calendar_menu_item_new (void) gboolean ido_calendar_menu_item_mark_day (IdoCalendarMenuItem *menuitem, guint day) { + g_return_val_if_fail(IDO_IS_CALENDAR_MENU_ITEM(menuitem), FALSE); + return gtk_calendar_mark_day(GTK_CALENDAR (menuitem->priv->calendar), day); } gboolean ido_calendar_menu_item_unmark_day (IdoCalendarMenuItem *menuitem, guint day) { + g_return_val_if_fail(IDO_IS_CALENDAR_MENU_ITEM(menuitem), FALSE); + return gtk_calendar_unmark_day(GTK_CALENDAR (menuitem->priv->calendar), day); } void ido_calendar_menu_item_clear_marks (IdoCalendarMenuItem *menuitem) { + g_return_if_fail(IDO_IS_CALENDAR_MENU_ITEM(menuitem)); + gtk_calendar_clear_marks(GTK_CALENDAR (menuitem->priv->calendar)); } void ido_calendar_menu_item_set_display_options (IdoCalendarMenuItem *menuitem, GtkCalendarDisplayOptions flags) { + g_return_if_fail(IDO_IS_CALENDAR_MENU_ITEM(menuitem)); + gtk_calendar_set_display_options (GTK_CALENDAR (menuitem->priv->calendar), flags); } GtkCalendarDisplayOptions ido_calendar_menu_item_get_display_options (IdoCalendarMenuItem *menuitem) { + + g_return_val_if_fail(IDO_IS_CALENDAR_MENU_ITEM(menuitem), NULL); + return gtk_calendar_get_display_options (GTK_CALENDAR (menuitem->priv->calendar)); } @@ -312,6 +323,7 @@ ido_calendar_menu_item_get_date (IdoCalendarMenuItem *menuitem, guint *year, guint *month, guint *day) { - - gtk_calendar_get_date (GTK_CALENDAR (menuitem->priv->calendar), year, month, day); + + g_return_if_fail(IDO_IS_CALENDAR_MENU_ITEM(menuitem)); + gtk_calendar_get_date (GTK_CALENDAR (menuitem->priv->calendar), year, month, day); } -- cgit v1.2.3 From 400488354b37ad16467c9e251b8b20c3bf3d2a83 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Fri, 25 Feb 2011 13:26:35 -0500 Subject: compile fix --- src/idocalendarmenuitem.c | 3 +-- src/libido.h | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/idocalendarmenuitem.c b/src/idocalendarmenuitem.c index ba46ae2..e004841 100644 --- a/src/idocalendarmenuitem.c +++ b/src/idocalendarmenuitem.c @@ -312,8 +312,7 @@ ido_calendar_menu_item_set_display_options (IdoCalendarMenuItem *menuitem, GtkCa GtkCalendarDisplayOptions ido_calendar_menu_item_get_display_options (IdoCalendarMenuItem *menuitem) { - - g_return_val_if_fail(IDO_IS_CALENDAR_MENU_ITEM(menuitem), NULL); + g_return_val_if_fail(IDO_IS_CALENDAR_MENU_ITEM(menuitem), 0); return gtk_calendar_get_display_options (GTK_CALENDAR (menuitem->priv->calendar)); } diff --git a/src/libido.h b/src/libido.h index ef0b8b3..4c4f68b 100644 --- a/src/libido.h +++ b/src/libido.h @@ -26,6 +26,7 @@ #ifndef __IDO__ #define __IDO__ +#include #include #include #include -- cgit v1.2.3