diff options
| author | Milan Crha <mcrha@redhat.com> | 2010-07-09 20:29:51 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2010-07-09 20:29:51 +0800 |
| commit | 03d626856b294bc98919ac244e04e9b8821a681d (patch) | |
| tree | 62433e158f1791aa6b9222ecbe05d164c4703f6c /calendar/gui/e-itip-control.c | |
| parent | 6d4ce8571ff62a3e489999d2feeac1691e06c59a (diff) | |
| download | gsoc2013-evolution-03d626856b294bc98919ac244e04e9b8821a681d.tar gsoc2013-evolution-03d626856b294bc98919ac244e04e9b8821a681d.tar.gz gsoc2013-evolution-03d626856b294bc98919ac244e04e9b8821a681d.tar.bz2 gsoc2013-evolution-03d626856b294bc98919ac244e04e9b8821a681d.tar.lz gsoc2013-evolution-03d626856b294bc98919ac244e04e9b8821a681d.tar.xz gsoc2013-evolution-03d626856b294bc98919ac244e04e9b8821a681d.tar.zst gsoc2013-evolution-03d626856b294bc98919ac244e04e9b8821a681d.zip | |
Bug #623204 - Be able to report detailed errors from backends
Diffstat (limited to 'calendar/gui/e-itip-control.c')
| -rw-r--r-- | calendar/gui/e-itip-control.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c index fed200d34c..dd9516f7bf 100644 --- a/calendar/gui/e-itip-control.c +++ b/calendar/gui/e-itip-control.c @@ -142,7 +142,7 @@ set_ok_sens (EItipControl *itip) } static void -cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data) +cal_opened_cb (ECal *ecal, const GError *error, gpointer data) { EItipControl *itip = data; EItipControlPrivate *priv; @@ -156,7 +156,7 @@ cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data) g_signal_handlers_disconnect_matched (ecal, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, cal_opened_cb, NULL); - if (status != E_CALENDAR_STATUS_OK) { + if (error) { g_hash_table_remove (priv->ecals[source_type], e_source_peek_uid (source)); return; @@ -166,7 +166,7 @@ cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data) set_ok_sens (itip); } -typedef void (* EItipControlOpenFunc) (ECal *ecal, ECalendarStatus status, gpointer data); +typedef void (* EItipControlOpenFunc) (ECal *ecal, const GError *error, gpointer data); static ECal * start_calendar_server (EItipControl *itip, ESource *source, ECalSourceType type, EItipControlOpenFunc func, gpointer data) @@ -189,7 +189,7 @@ start_calendar_server (EItipControl *itip, ESource *source, ECalSourceType type, zone = calendar_config_get_icaltimezone (); e_cal_set_default_timezone (ecal, zone, NULL); - g_signal_connect (G_OBJECT (ecal), "cal_opened", G_CALLBACK (func), data); + g_signal_connect (G_OBJECT (ecal), "cal_opened_ex", G_CALLBACK (func), data); g_hash_table_insert (priv->ecals[type], g_strdup (e_source_peek_uid (source)), ecal); @@ -239,7 +239,7 @@ source_changed_cb (ESourceComboBox *escb, EItipControl *itip) } static void -find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data) +find_cal_opened_cb (ECal *ecal, const GError *error, gpointer data) { EShell *shell; EShellSettings *shell_settings; @@ -262,7 +262,7 @@ find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data) g_signal_handlers_disconnect_matched (ecal, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, find_cal_opened_cb, NULL); - if (status != E_CALENDAR_STATUS_OK) { + if (error) { g_hash_table_remove (priv->ecals[source_type], e_source_peek_uid (source)); goto cleanup; |