diff options
| author | karl-qdh <karl@qdh.org.uk> | 2011-03-06 13:05:52 +0000 |
|---|---|---|
| committer | karl-qdh <karl@qdh.org.uk> | 2011-03-06 13:05:52 +0000 |
| commit | aac517392fa79bcebf164b6f65ac90566aa98c89 (patch) | |
| tree | b93395a6e2687133f15b131b96cabba48ec34b3a | |
| parent | 368393bf30ff81a02a800441ddef5640c4b0d207 (diff) | |
| parent | a38ef76289761495301c80b2473cbf3089b6a8e6 (diff) | |
| download | ayatana-ido-aac517392fa79bcebf164b6f65ac90566aa98c89.tar.gz ayatana-ido-aac517392fa79bcebf164b6f65ac90566aa98c89.tar.bz2 ayatana-ido-aac517392fa79bcebf164b6f65ac90566aa98c89.zip | |
Merge with trunk
| -rw-r--r-- | src/idocalendarmenuitem.c | 11 | ||||
| -rw-r--r-- | src/idocalendarmenuitem.h | 1 | ||||
| -rw-r--r-- | src/libido.h | 1 |
3 files changed, 11 insertions, 2 deletions
diff --git a/src/idocalendarmenuitem.c b/src/idocalendarmenuitem.c index d49aacf..0496cc4 100644 --- a/src/idocalendarmenuitem.c +++ b/src/idocalendarmenuitem.c @@ -314,6 +314,14 @@ ido_calendar_menu_item_new (void) return g_object_new (IDO_TYPE_CALENDAR_MENU_ITEM, NULL); } +GtkWidget * +ido_calendar_menu_item_get_calendar (IdoCalendarMenuItem *item) +{ + g_return_val_if_fail (IDO_IS_CALENDAR_MENU_ITEM (item), NULL); + + return item->priv->calendar; +} + gboolean ido_calendar_menu_item_mark_day (IdoCalendarMenuItem *menuitem, guint day) { @@ -349,8 +357,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/idocalendarmenuitem.h b/src/idocalendarmenuitem.h index 00bb7d5..c4833fb 100644 --- a/src/idocalendarmenuitem.h +++ b/src/idocalendarmenuitem.h @@ -56,6 +56,7 @@ struct _IdoCalendarMenuItemClass GType ido_calendar_menu_item_get_type (void) G_GNUC_CONST; GtkWidget *ido_calendar_menu_item_new (void); +GtkWidget *ido_calendar_menu_item_get_calendar (IdoCalendarMenuItem *menuitem); gboolean ido_calendar_menu_item_mark_day (IdoCalendarMenuItem *menuitem, guint day); gboolean ido_calendar_menu_item_unmark_day (IdoCalendarMenuItem *menuitem, guint day); void ido_calendar_menu_item_clear_marks (IdoCalendarMenuItem *menuitem); 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 <libido/idocalendarmenuitem.h> #include <libido/idoscalemenuitem.h> #include <libido/idoentrymenuitem.h> #include <libido/idomessagedialog.h> |