aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-07-01 02:19:59 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-09-14 20:08:33 +0800
commit51e9cc6057ca5530a498864b0624028882e9e585 (patch)
tree0333f949f899989bd14f5aaf8eac5cc2e2c56f33 /modules
parente611831568dd79ed64ffc8c2fa267e4dbec957ad (diff)
downloadgsoc2013-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')
-rw-r--r--modules/addressbook/addressbook-config.c56
-rw-r--r--modules/calendar/e-calendar-preferences.c1
-rw-r--r--modules/mail/em-composer-prefs.c1
-rw-r--r--modules/mail/em-mailer-prefs.c7
-rw-r--r--modules/mail/em-network-prefs.c7
-rw-r--r--modules/startup-wizard/evolution-startup-wizard.c6
6 files changed, 66 insertions, 12 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;
diff --git a/modules/calendar/e-calendar-preferences.c b/modules/calendar/e-calendar-preferences.c
index f35c88a6ed..40ba9c7937 100644
--- a/modules/calendar/e-calendar-preferences.c
+++ b/modules/calendar/e-calendar-preferences.c
@@ -158,6 +158,7 @@ calendar_preferences_get_config_widget (EConfig *ec,
EConfigItem *item,
GtkWidget *parent,
GtkWidget *old,
+ gint position,
gpointer data)
{
ECalendarPreferences *preferences = data;
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c
index a3e5bfae7f..39da8544ec 100644
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@ -252,6 +252,7 @@ emcp_widget_glade (EConfig *ec,
EConfigItem *item,
GtkWidget *parent,
GtkWidget *old,
+ gint position,
gpointer data)
{
EMComposerPrefs *prefs = data;
diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c
index 18b5a1d00b..8e2688e615 100644
--- a/modules/mail/em-mailer-prefs.c
+++ b/modules/mail/em-mailer-prefs.c
@@ -637,7 +637,12 @@ http_images_changed (GtkWidget *widget, EMMailerPrefs *prefs)
}
static GtkWidget *
-emmp_widget_glade (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data)
+emmp_widget_glade (EConfig *ec,
+ EConfigItem *item,
+ GtkWidget *parent,
+ GtkWidget *old,
+ gint position,
+ gpointer data)
{
EMMailerPrefs *prefs = data;
diff --git a/modules/mail/em-network-prefs.c b/modules/mail/em-network-prefs.c
index 3094f15f47..05572cb766 100644
--- a/modules/mail/em-network-prefs.c
+++ b/modules/mail/em-network-prefs.c
@@ -107,7 +107,12 @@ toggle_button_init (EMNetworkPrefs *prefs, GtkToggleButton *toggle, const gchar
}
static GtkWidget *
-emnp_widget_glade (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data)
+emnp_widget_glade (EConfig *ec,
+ EConfigItem *item,
+ GtkWidget *parent,
+ GtkWidget *old,
+ gint position,
+ gpointer data)
{
EMNetworkPrefs *prefs = data;
diff --git a/modules/startup-wizard/evolution-startup-wizard.c b/modules/startup-wizard/evolution-startup-wizard.c
index cd2a363195..5e3b028cdf 100644
--- a/modules/startup-wizard/evolution-startup-wizard.c
+++ b/modules/startup-wizard/evolution-startup-wizard.c
@@ -253,6 +253,7 @@ startup_wizard_importer_page (EConfig *config,
EConfigItem *item,
GtkAssistant *assistant,
GtkWidget *old,
+ gint position,
EStartupWizard *extension)
{
GtkWidget *container;
@@ -321,7 +322,7 @@ startup_wizard_importer_page (EConfig *config,
}
title = _("Importing Files");
- gtk_assistant_append_page (assistant, page);
+ gtk_assistant_insert_page (assistant, page, position);
gtk_assistant_set_page_title (assistant, page, title);
return page;
@@ -332,6 +333,7 @@ startup_wizard_progress_page (EConfig *config,
EConfigItem *item,
GtkAssistant *assistant,
GtkWidget *old,
+ gint position,
EStartupWizard *extension)
{
GtkSizeGroup *size_group;
@@ -418,7 +420,7 @@ startup_wizard_progress_page (EConfig *config,
gtk_widget_show (widget);
title = _("Importing Files");
- page_num = gtk_assistant_append_page (assistant, page);
+ page_num = gtk_assistant_insert_page (assistant, page, position);
gtk_assistant_set_page_title (assistant, page, title);
extension->import_progress_page_num = page_num;