[gnome-initial-setup/shell/4765: 34/362] Do not go next page automatically on language selection
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-initial-setup/shell/4765: 34/362] Do not go next page automatically on language selection
- Date: Thu, 19 Mar 2015 01:23:55 +0000 (UTC)
commit 006a8ae78aab97812fc301ca82fea2ff6d63517d
Author: Juan A. Suarez Romero <jasuarez igalia com>
Date: Tue May 6 11:26:24 2014 +0200
Do not go next page automatically on language selection
When selecting a language, do not go automatically to the next page, as
this takes some time and user can be confused if meanwhile they press
'Next' button too, causing two transitions.
[endlessm/eos-shell#2423]
.../pages/language/gis-language-page.c | 26 +------------------
1 files changed, 2 insertions(+), 24 deletions(-)
---
diff --git a/gnome-initial-setup/pages/language/gis-language-page.c
b/gnome-initial-setup/pages/language/gis-language-page.c
index 89fcfda..cf6bf2f 100644
--- a/gnome-initial-setup/pages/language/gis-language-page.c
+++ b/gnome-initial-setup/pages/language/gis-language-page.c
@@ -44,7 +44,6 @@ struct _GisLanguagePagePrivate
GDBusProxy *localed;
GPermission *permission;
const gchar *new_locale_id;
- guint selection_done_source;
GCancellable *cancellable;
};
@@ -158,31 +157,11 @@ set_language (GisLanguagePage *page)
}
static void
-set_language_and_change_page (GisLanguagePage *page)
-{
- GisLanguagePagePrivate *priv = gis_language_page_get_instance_private (page);
- GisDriver *driver;
-
- driver = GIS_PAGE (page)->driver;
-
- if (priv->selection_done_source > 0)
- {
- g_source_remove (priv->selection_done_source);
- priv->selection_done_source = 0;
- }
-
- set_language (page);
-
- priv->selection_done_source = g_timeout_add (500, _selection_done,
- (gpointer)driver);
-}
-
-static void
language_activated (CcLanguageChooser *chooser,
gchar *language,
GisLanguagePage *page)
{
- set_language_and_change_page (page);
+ set_language (page);
}
static void
@@ -190,7 +169,7 @@ language_changed (CcLanguageChooser *chooser,
GParamSpec *pspec,
GisLanguagePage *page)
{
- set_language_and_change_page (page);
+ set_language (page);
}
static void
@@ -270,7 +249,6 @@ gis_language_page_dispose (GObject *object)
GisLanguagePage *page = GIS_LANGUAGE_PAGE (object);
GisLanguagePagePrivate *priv = gis_language_page_get_instance_private (page);
- g_source_remove (priv->selection_done_source);
g_clear_object (&priv->permission);
g_clear_object (&priv->localed);
g_clear_object (&priv->cancellable);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]