diff options
author | Rui Matos <tiagomatos@gmail.com> | 2013-05-26 17:58:32 +0200 |
---|---|---|
committer | Rui Matos <tiagomatos@gmail.com> | 2013-05-30 13:58:17 +0200 |
commit | 84d4cfee6c9e4711fea29dc286920731e7014780 (patch) | |
tree | 8b77e097295a4d44ae280cfa84b4a267406f0f42 /plugins | |
parent | df4325cd5fe8368eea23b10ca945ad0a5ee7bb99 (diff) | |
download | gnome-settings-daemon-84d4cfee6c9e4711fea29dc286920731e7014780.tar.gz |
keyboard: Move method a bit further in the file
So that we can call register_manager_dbus() from localed_proxy_ready()
in the next commit.
https://bugzilla.gnome.org/show_bug.cgi?id=701055
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/keyboard/gsd-keyboard-manager.c | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/plugins/keyboard/gsd-keyboard-manager.c b/plugins/keyboard/gsd-keyboard-manager.c index fa0b3c54..fe25c940 100644 --- a/plugins/keyboard/gsd-keyboard-manager.c +++ b/plugins/keyboard/gsd-keyboard-manager.c @@ -1424,32 +1424,6 @@ maybe_create_initial_settings (GsdKeyboardManager *manager) } static void -localed_proxy_ready (GObject *source, - GAsyncResult *res, - gpointer data) -{ - GsdKeyboardManager *manager = data; - GDBusProxy *proxy; - GError *error = NULL; - - proxy = g_dbus_proxy_new_finish (res, &error); - if (!proxy) { - if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { - g_error_free (error); - return; - } - g_warning ("Failed to contact localed: %s", error->message); - g_error_free (error); - goto out; - } - - manager->priv->localed = proxy; - maybe_create_initial_settings (manager); -out: - apply_input_sources_settings (manager->priv->input_sources_settings, NULL, 0, manager); -} - -static void set_input_source_return (GDBusMethodInvocation *invocation) { g_dbus_method_invocation_return_value (invocation, NULL); @@ -1597,6 +1571,32 @@ register_manager_dbus (GsdKeyboardManager *manager) manager); } +static void +localed_proxy_ready (GObject *source, + GAsyncResult *res, + gpointer data) +{ + GsdKeyboardManager *manager = data; + GDBusProxy *proxy; + GError *error = NULL; + + proxy = g_dbus_proxy_new_finish (res, &error); + if (!proxy) { + if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { + g_error_free (error); + return; + } + g_warning ("Failed to contact localed: %s", error->message); + g_error_free (error); + goto out; + } + + manager->priv->localed = proxy; + maybe_create_initial_settings (manager); +out: + apply_input_sources_settings (manager->priv->input_sources_settings, NULL, 0, manager); +} + static gboolean start_keyboard_idle_cb (GsdKeyboardManager *manager) { |