Federated_Computer/federated-calendar
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

date-selector: factor out duplicated code

Browse Source
This commit is contained in:
Georges Basile Stavracas Neto
2014-12-23 12:01:41 -05:00
committed by Erick Pérez Castellanos
parent 13a3fb9638
commit fddac33fad
1 changed files with 13 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gcal-date-selector.c
+13 -43
View File
@@ -71,6 +71,8 @@ static gboolean date_entry_focus_out (GtkWidget
static void entry_activated (GtkEntry *entry, static void entry_activated (GtkEntry *entry,
gpointer user_data); gpointer user_data);
static void parse_entries (GcalDateSelector *selector);
static void text_inserted (GtkEditable *editable, static void text_inserted (GtkEditable *editable,
gchar *new_text, gchar *new_text,
gint new_text_length, gint new_text_length,
@@ -110,56 +112,24 @@ date_entry_focus_out (GtkWidget *widget,
GdkEvent *event, GdkEvent *event,
gpointer user_data) gpointer user_data)
{ {
GcalDateSelectorPrivate *priv; parse_entries (GCAL_DATE_SELECTOR (user_data));
gint day, month, year;
priv = gcal_date_selector_get_instance_private (GCAL_DATE_SELECTOR (user_data));
day = strtol (gtk_entry_get_text (GTK_ENTRY (priv->entries[DAY])), NULL, 0);
month = strtol (gtk_entry_get_text (GTK_ENTRY (priv->entries[MONTH])), NULL, 0);
year = strtol (gtk_entry_get_text (GTK_ENTRY (priv->entries[YEAR])), NULL, 0);
/* Fix year if neccessary */
if (!priv->have_long_year)
{
GDateTime *dt;
gint suffix;
dt = g_date_time_new_now_local ();
suffix = g_date_time_get_year (dt) % 100;
/* last century */
if (year > suffix)
year += g_date_time_get_year (dt) - suffix - 100;
/* this century */
else
year += g_date_time_get_year (dt) - suffix;
g_date_time_unref (dt);
}
/* select the date */
g_signal_handlers_block_by_func (priv->calendar,
calendar_day_selected,
user_data);
gcal_date_selector_set_date (GCAL_DATE_SELECTOR (user_data), day, month, year);
g_signal_handlers_unblock_by_func (priv->calendar,
calendar_day_selected,
user_data);
return FALSE; return FALSE;
} }
static void static void
entry_activated (GtkEntry *entry, entry_activated (GtkEntry *entry,
gpointer user_data) gpointer user_data)
{
parse_entries (GCAL_DATE_SELECTOR (user_data));
}
static void
parse_entries (GcalDateSelector *selector)
{ {
GcalDateSelectorPrivate *priv; GcalDateSelectorPrivate *priv;
gint day, month, year; gint day, month, year;
priv = gcal_date_selector_get_instance_private (GCAL_DATE_SELECTOR (user_data)); priv = gcal_date_selector_get_instance_private (selector);
day = strtol (gtk_entry_get_text (GTK_ENTRY (priv->entries[DAY])), NULL, 0); day = strtol (gtk_entry_get_text (GTK_ENTRY (priv->entries[DAY])), NULL, 0);
month = strtol (gtk_entry_get_text (GTK_ENTRY (priv->entries[MONTH])), NULL, 0); month = strtol (gtk_entry_get_text (GTK_ENTRY (priv->entries[MONTH])), NULL, 0);
@@ -188,12 +158,12 @@ entry_activated (GtkEntry *entry,
/* select the date */ /* select the date */
g_signal_handlers_block_by_func (priv->calendar, g_signal_handlers_block_by_func (priv->calendar,
calendar_day_selected, calendar_day_selected,
user_data); selector);
gcal_date_selector_set_date (GCAL_DATE_SELECTOR (user_data), day, month, year); gcal_date_selector_set_date (selector, day, month, year);
g_signal_handlers_unblock_by_func (priv->calendar, g_signal_handlers_unblock_by_func (priv->calendar,
calendar_day_selected, calendar_day_selected,
user_data); selector);
} }
static void static void