aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkarl-qdh <karl@qdh.org.uk>2011-02-25 13:12:18 +0000
committerkarl-qdh <karl@qdh.org.uk>2011-02-25 13:12:18 +0000
commit6b313f1640cbf54500762979e9f24e7f86995083 (patch)
tree6547f036aec9b00a32a6991b1f04b57e2c8abdf1
parenta7e9eed72ef50398e530784db7e6d91cabbb56aa (diff)
parent3072fd1740dca237612b7cf94ac19aadb1d4a3e6 (diff)
downloadayatana-ido-6b313f1640cbf54500762979e9f24e7f86995083.tar.gz
ayatana-ido-6b313f1640cbf54500762979e9f24e7f86995083.tar.bz2
ayatana-ido-6b313f1640cbf54500762979e9f24e7f86995083.zip
Merging with trunk
-rw-r--r--configure.ac2
-rw-r--r--src/idocalendarmenuitem.h10
2 files changed, 6 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index c09aabf..9967cb2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
#
m4_define([ido_major_version], [0])
m4_define([ido_minor_version], [2])
-m4_define([ido_micro_version], [0])
+m4_define([ido_micro_version], [1])
m4_define([ido_api_version],
[ido_major_version.ido_minor_version])
diff --git a/src/idocalendarmenuitem.h b/src/idocalendarmenuitem.h
index 22e1008..cecab16 100644
--- a/src/idocalendarmenuitem.h
+++ b/src/idocalendarmenuitem.h
@@ -56,15 +56,15 @@ struct _IdoCalendarMenuItemClass
GType ido_calendar_menu_item_get_type (void) G_GNUC_CONST;
GtkWidget *ido_calendar_menu_item_new (void);
-gboolean ido_calendar_menu_item_mark_day (IdoCalendarMenuItem *menuitem, guint day);
+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);
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,
- guint *day)
+void ido_calendar_menu_item_get_date (IdoCalendarMenuItem *menuitem,
+ guint *year,
+ guint *month,
+ guint *day);
G_END_DECLS
#endif /* __IDO_CALENDAR_MENU_ITEM_H__ */