aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-07-01 02:19:59 +0800
committerMatthew Barnes <mbarnes@redhat.com>2011-07-01 02:19:59 +0800
commit1b1697630caf05f1831f6d9a1dd5e8c3f3def429 (patch)
tree278d99b4022571dbafacc6f7aa85a8e447d6bc81 /calendar
parentbe69a3913cac46922111a87e7e813647573de089 (diff)
downloadgsoc2013-evolution-1b1697630caf05f1831f6d9a1dd5e8c3f3def429.tar.gz
gsoc2013-evolution-1b1697630caf05f1831f6d9a1dd5e8c3f3def429.tar.zst
gsoc2013-evolution-1b1697630caf05f1831f6d9a1dd5e8c3f3def429.zip
Bug 652958 - Evolution Account Assistant jumps steps
The GTK+ patch in bug 653705 is also required for the Account Assistant to work properly under the new GtkAssistant design in GTK+ 3.1. This commit only deals with sidebar ordering issues.
Diffstat (limited to 'calendar')
-rw-r--r--calendar/gui/dialogs/calendar-setup.c28
1 files changed, 24 insertions, 4 deletions
diff --git a/calendar/gui/dialogs/calendar-setup.c b/calendar/gui/dialogs/calendar-setup.c
index 231cd0dd34..7dfbfdb4f2 100644
--- a/calendar/gui/dialogs/calendar-setup.c
+++ b/calendar/gui/dialogs/calendar-setup.c
@@ -140,7 +140,12 @@ eccp_type_changed (GtkComboBox *dropdown, CalendarSourceDialog *sdialog)
}
static GtkWidget *
-eccp_get_source_type (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data)
+eccp_get_source_type (EConfig *ec,
+ EConfigItem *item,
+ GtkWidget *parent,
+ GtkWidget *old,
+ gint position,
+ gpointer data)
{
static GtkWidget *label, *type;
guint row;
@@ -217,7 +222,12 @@ name_changed (GtkEntry *entry, ECalConfigTargetSource *t)
}
static GtkWidget *
-eccp_get_source_name (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data)
+eccp_get_source_name (EConfig *ec,
+ EConfigItem *item,
+ GtkWidget *parent,
+ GtkWidget *old,
+ gint position,
+ gpointer data)
{
static GtkWidget *label, *entry;
guint row;
@@ -258,7 +268,12 @@ offline_status_changed_cb (GtkWidget *widget, CalendarSourceDialog *sdialog)
}
static GtkWidget *
-eccp_general_offline (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data)
+eccp_general_offline (EConfig *ec,
+ EConfigItem *item,
+ GtkWidget *parent,
+ GtkWidget *old,
+ gint position,
+ gpointer data)
{
CalendarSourceDialog *sdialog = data;
GtkWidget *offline_setting = NULL;
@@ -324,7 +339,12 @@ choose_initial_color (void)
}
static GtkWidget *
-eccp_get_source_color (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data)
+eccp_get_source_color (EConfig *ec,
+ EConfigItem *item,
+ GtkWidget *parent,
+ GtkWidget *old,
+ gint position,
+ gpointer data)
{
CalendarSourceDialog *sdialog = data;
static GtkWidget *label, *color_button;