diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2011-12-24 06:57:26 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2011-12-24 08:49:53 +0800 |
commit | 6feca1bf560b3269555d4f0a890cd192fdaa0f00 (patch) | |
tree | dd77b59b48d803fc095b9ea86dc02dbbd152e0db /calendar/gui/dialogs/alarm-dialog.c | |
parent | 9d4348036c46232d3cfc728724be8b1d80e1df78 (diff) | |
download | gsoc2013-evolution-6feca1bf560b3269555d4f0a890cd192fdaa0f00.tar gsoc2013-evolution-6feca1bf560b3269555d4f0a890cd192fdaa0f00.tar.gz gsoc2013-evolution-6feca1bf560b3269555d4f0a890cd192fdaa0f00.tar.bz2 gsoc2013-evolution-6feca1bf560b3269555d4f0a890cd192fdaa0f00.tar.lz gsoc2013-evolution-6feca1bf560b3269555d4f0a890cd192fdaa0f00.tar.xz gsoc2013-evolution-6feca1bf560b3269555d4f0a890cd192fdaa0f00.tar.zst gsoc2013-evolution-6feca1bf560b3269555d4f0a890cd192fdaa0f00.zip |
Remove e_dialog_editable_get().
Silly function. Use gtk_entry_get_text() for a const string or else
gtk_editable_get_chars() for an allocated string.
Diffstat (limited to 'calendar/gui/dialogs/alarm-dialog.c')
-rw-r--r-- | calendar/gui/dialogs/alarm-dialog.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c index b5aaed5093..d18594e826 100644 --- a/calendar/gui/dialogs/alarm-dialog.c +++ b/calendar/gui/dialogs/alarm-dialog.c @@ -576,28 +576,24 @@ static void palarm_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm) { - gchar *program; icalattach *attach; - gchar *str; ECalComponentText description; icalcomponent *icalcomp; icalproperty *icalprop; + const gchar *text; - program = e_dialog_editable_get (dialog->palarm_program); - attach = icalattach_new_from_url (program ? program : ""); - g_free (program); + text = gtk_entry_get_text (GTK_ENTRY (dialog->palarm_program)); + attach = icalattach_new_from_url ((text != NULL) ? text : ""); e_cal_component_alarm_set_attach (alarm, attach); icalattach_unref (attach); - str = e_dialog_editable_get (dialog->palarm_args); - - description.value = str; - description.altrep = NULL; + text = gtk_entry_get_text (GTK_ENTRY (dialog->palarm_args)); - e_cal_component_alarm_set_description (alarm, &description); + description.value = text; + description.altrep = NULL; - g_free (str); + e_cal_component_alarm_set_description (alarm, &description); /* remove the X-EVOLUTION-NEEDS-DESCRIPTION property, so that * we don't re-set the alarm's description */ @@ -1040,13 +1036,17 @@ dalarm_description_changed_cb (GtkWidget *widget, static void check_custom_program (Dialog *dialog) { - gchar *str; - gboolean sens; + GtkEntry *entry; + const gchar *text; + gboolean sensitive; - str = e_dialog_editable_get (dialog->palarm_program); + entry = GTK_ENTRY (dialog->palarm_program); + text = gtk_entry_get_text (entry); + sensitive = (text != NULL && *text != '\0'); - sens = str && *str; - gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog->toplevel), GTK_RESPONSE_OK, sens); + gtk_dialog_set_response_sensitive ( + GTK_DIALOG (dialog->toplevel), + GTK_RESPONSE_OK, sensitive); } static void |