[gnome-settings-daemon/gnome-3-8] keyboard: Move method a bit further in the file
- From: Rui Matos <rtcm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon/gnome-3-8] keyboard: Move method a bit further in the file
- Date: Thu, 30 May 2013 11:57:17 +0000 (UTC)
commit 90c7a03375c66f53e835e71d999fba190333b223
Author: Rui Matos <tiagomatos gmail com>
Date: Sun May 26 17:58:32 2013 +0200
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
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 61bea63..9124e59 100644
--- a/plugins/keyboard/gsd-keyboard-manager.c
+++ b/plugins/keyboard/gsd-keyboard-manager.c
@@ -1480,32 +1480,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);
@@ -1653,6 +1627,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)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]