[gtk+/gtk-2-22] GtkCalendar: some functions always return TRUE, so change them to void
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-2-22] GtkCalendar: some functions always return TRUE, so change them to void
- Date: Sat, 26 Jun 2010 20:31:15 +0000 (UTC)
commit a9b778931c6ba0d1bb37eb29b5ec13dc76339820
Author: Thomas Wood <thos gnome org>
Date: Tue Jun 15 00:00:40 2010 -0400
GtkCalendar: some functions always return TRUE, so change them to void
Certain functions for GtkCalendar always return the same value. Therefore
they do not actually need to return a value at all.
Bug #621136.
(cherry picked from commit e19c50b538d7a7d2b683f9965a2ba6cc1047df51)
gtk/gtkcalendar.c | 49 +++++++++++++++++++------------------------------
gtk/gtkcalendar.h | 6 +++---
2 files changed, 22 insertions(+), 33 deletions(-)
---
diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index 80f67d3..668ebae 100644
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -3676,22 +3676,20 @@ gtk_calendar_set_display_options (GtkCalendar *calendar,
* @calendar: a #GtkCalendar
* @month: a month number between 0 and 11.
* @year: the year the month is in.
- *
+ *
* Shifts the calendar to a different month.
- *
- * Return value: %TRUE, always
**/
-gboolean
+void
gtk_calendar_select_month (GtkCalendar *calendar,
guint month,
guint year)
{
- g_return_val_if_fail (GTK_IS_CALENDAR (calendar), FALSE);
- g_return_val_if_fail (month <= 11, FALSE);
-
+ g_return_if_fail (GTK_IS_CALENDAR (calendar));
+ g_return_if_fail (month <= 11);
+
calendar->month = month;
calendar->year = year;
-
+
calendar_compute_days (calendar);
calendar_queue_refresh (calendar);
@@ -3703,7 +3701,6 @@ gtk_calendar_select_month (GtkCalendar *calendar,
g_signal_emit (calendar,
gtk_calendar_signals[MONTH_CHANGED_SIGNAL],
0);
- return TRUE;
}
/**
@@ -3772,52 +3769,44 @@ gtk_calendar_clear_marks (GtkCalendar *calendar)
/**
* gtk_calendar_mark_day:
- * @calendar: a #GtkCalendar
+ * @calendar: a #GtkCalendar
* @day: the day number to mark between 1 and 31.
- *
+ *
* Places a visual marker on a particular day.
- *
- * Return value: %TRUE, always
- **/
-gboolean
+ */
+void
gtk_calendar_mark_day (GtkCalendar *calendar,
guint day)
{
- g_return_val_if_fail (GTK_IS_CALENDAR (calendar), FALSE);
-
- if (day >= 1 && day <= 31 && calendar->marked_date[day-1] == FALSE)
+ g_return_if_fail (GTK_IS_CALENDAR (calendar));
+
+ if (day >= 1 && day <= 31 && !calendar->marked_date[day-1])
{
calendar->marked_date[day - 1] = TRUE;
calendar->num_marked_dates++;
calendar_invalidate_day_num (calendar, day);
}
-
- return TRUE;
}
/**
* gtk_calendar_unmark_day:
* @calendar: a #GtkCalendar.
* @day: the day number to unmark between 1 and 31.
- *
+ *
* Removes the visual marker from a particular day.
- *
- * Return value: %TRUE, always
- **/
-gboolean
+ */
+void
gtk_calendar_unmark_day (GtkCalendar *calendar,
guint day)
{
- g_return_val_if_fail (GTK_IS_CALENDAR (calendar), FALSE);
-
- if (day >= 1 && day <= 31 && calendar->marked_date[day-1] == TRUE)
+ g_return_if_fail (GTK_IS_CALENDAR (calendar));
+
+ if (day >= 1 && day <= 31 && calendar->marked_date[day-1])
{
calendar->marked_date[day - 1] = FALSE;
calendar->num_marked_dates--;
calendar_invalidate_day_num (calendar, day);
}
-
- return TRUE;
}
/**
diff --git a/gtk/gtkcalendar.h b/gtk/gtkcalendar.h
index 9648d25..73092d1 100644
--- a/gtk/gtkcalendar.h
+++ b/gtk/gtkcalendar.h
@@ -159,15 +159,15 @@ struct _GtkCalendarClass
GType gtk_calendar_get_type (void) G_GNUC_CONST;
GtkWidget* gtk_calendar_new (void);
-gboolean gtk_calendar_select_month (GtkCalendar *calendar,
+void gtk_calendar_select_month (GtkCalendar *calendar,
guint month,
guint year);
void gtk_calendar_select_day (GtkCalendar *calendar,
guint day);
-gboolean gtk_calendar_mark_day (GtkCalendar *calendar,
+void gtk_calendar_mark_day (GtkCalendar *calendar,
guint day);
-gboolean gtk_calendar_unmark_day (GtkCalendar *calendar,
+void gtk_calendar_unmark_day (GtkCalendar *calendar,
guint day);
void gtk_calendar_clear_marks (GtkCalendar *calendar);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]