diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2011-07-01 02:19:59 +0800 |
---|---|---|
committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-09-14 20:08:33 +0800 |
commit | 51e9cc6057ca5530a498864b0624028882e9e585 (patch) | |
tree | 0333f949f899989bd14f5aaf8eac5cc2e2c56f33 /modules/addressbook | |
parent | e611831568dd79ed64ffc8c2fa267e4dbec957ad (diff) | |
download | gsoc2013-evolution-51e9cc6057ca5530a498864b0624028882e9e585.tar gsoc2013-evolution-51e9cc6057ca5530a498864b0624028882e9e585.tar.gz gsoc2013-evolution-51e9cc6057ca5530a498864b0624028882e9e585.tar.bz2 gsoc2013-evolution-51e9cc6057ca5530a498864b0624028882e9e585.tar.lz gsoc2013-evolution-51e9cc6057ca5530a498864b0624028882e9e585.tar.xz gsoc2013-evolution-51e9cc6057ca5530a498864b0624028882e9e585.tar.zst gsoc2013-evolution-51e9cc6057ca5530a498864b0624028882e9e585.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 'modules/addressbook')
-rw-r--r-- | modules/addressbook/addressbook-config.c | 56 |
1 files changed, 48 insertions, 8 deletions
diff --git a/modules/addressbook/addressbook-config.c b/modules/addressbook/addressbook-config.c index f39fa79426..3686fa60bd 100644 --- a/modules/addressbook/addressbook-config.c +++ b/modules/addressbook/addressbook-config.c @@ -493,7 +493,12 @@ eabc_type_changed (GtkComboBox *dropdown, AddressbookSourceDialog *sdialog) } static GtkWidget * -eabc_general_type (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) +eabc_general_type (EConfig *ec, + EConfigItem *item, + GtkWidget *parent, + GtkWidget *old, + gint position, + gpointer data) { AddressbookSourceDialog *sdialog = data; GtkComboBox *dropdown; @@ -556,7 +561,12 @@ name_changed_cb (GtkWidget *w, AddressbookSourceDialog *sdialog) } static GtkWidget * -eabc_general_name (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) +eabc_general_name (EConfig *ec, + EConfigItem *item, + GtkWidget *parent, + GtkWidget *old, + gint position, + gpointer data) { AddressbookSourceDialog *sdialog = data; const gchar *uri; @@ -597,7 +607,12 @@ use_in_cal_changed_cb (GtkWidget *widget, AddressbookSourceDialog *sdialog) } static GtkWidget * -eabc_general_use_in_cal (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) +eabc_general_use_in_cal (EConfig *ec, + EConfigItem *item, + GtkWidget *parent, + GtkWidget *old, + gint position, + gpointer data) { AddressbookSourceDialog *sdialog = data; GtkWidget *use_in_cal_setting; @@ -631,7 +646,12 @@ offline_status_changed_cb (GtkWidget *widget, AddressbookSourceDialog *sdialog) } static GtkWidget * -eabc_general_offline (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) +eabc_general_offline (EConfig *ec, + EConfigItem *item, + GtkWidget *parent, + GtkWidget *old, + gint position, + gpointer data) { AddressbookSourceDialog *sdialog = data; GtkWidget *offline_setting; @@ -721,7 +741,12 @@ ssl_combobox_changed_cb (GtkWidget *w, AddressbookSourceDialog *sdialog) } static GtkWidget * -eabc_general_host (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) +eabc_general_host (EConfig *ec, + EConfigItem *item, + GtkWidget *parent, + GtkWidget *old, + gint position, + gpointer data) { AddressbookSourceDialog *sdialog = data; const gchar *tmp; @@ -806,7 +831,12 @@ auth_combobox_changed_cb (GtkWidget *w, AddressbookSourceDialog *sdialog) } static GtkWidget * -eabc_general_auth (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) +eabc_general_auth (EConfig *ec, + EConfigItem *item, + GtkWidget *parent, + GtkWidget *old, + gint position, + gpointer data) { AddressbookSourceDialog *sdialog = data; GtkWidget *w; @@ -871,7 +901,12 @@ scope_combobox_changed_cb (GtkWidget *w, AddressbookSourceDialog *sdialog) } static GtkWidget * -eabc_details_search (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) +eabc_details_search (EConfig *ec, + EConfigItem *item, + GtkWidget *parent, + GtkWidget *old, + gint position, + gpointer data) { AddressbookSourceDialog *sdialog = data; GtkWidget *w; @@ -965,7 +1000,12 @@ canbrowse_toggled_cb (GtkWidget *toggle_button, ESource *source) } static GtkWidget * -eabc_details_limit (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) +eabc_details_limit (EConfig *ec, + EConfigItem *item, + GtkWidget *parent, + GtkWidget *old, + gint position, + gpointer data) { AddressbookSourceDialog *sdialog = data; GtkAdjustment *adjustment; |