diff options
| author | rbuj <[email protected]> | 2020-02-14 07:54:19 +0100 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2020-03-09 15:26:43 +0100 |
| commit | 33e52564affb7fbc50ad68a08c43c9f70e7d1bb4 (patch) | |
| tree | 9ac72ec71977ec83ab647b502dbf4bd4a9639a1f /src/egg-console-kit.c | |
| parent | 9f3d2d0986a6130b1cefc84caae161d75b4f56ba (diff) | |
| download | mate-power-manager-33e52564affb7fbc50ad68a08c43c9f70e7d1bb4.tar.bz2 mate-power-manager-33e52564affb7fbc50ad68a08c43c9f70e7d1bb4.tar.xz | |
Port from EggDebug to the built-in GLib logging framework
Diffstat (limited to 'src/egg-console-kit.c')
| -rw-r--r-- | src/egg-console-kit.c | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/src/egg-console-kit.c b/src/egg-console-kit.c index 32a81bd..3c3c977 100644 --- a/src/egg-console-kit.c +++ b/src/egg-console-kit.c @@ -28,7 +28,6 @@ #include <dbus/dbus-glib.h> #include <dbus/dbus.h> -#include "egg-debug.h" #include "egg-console-kit.h" static void egg_console_kit_finalize (GObject *object); @@ -75,7 +74,7 @@ egg_console_kit_restart (EggConsoleKit *console, GError **error) ret = dbus_g_proxy_call (console->priv->proxy_manager, "Restart", &error_local, G_TYPE_INVALID, G_TYPE_INVALID); if (!ret) { - egg_warning ("Couldn't restart: %s", error_local->message); + g_warning ("Couldn't restart: %s", error_local->message); if (error != NULL) *error = g_error_new (1, 0, "%s", error_local->message); g_error_free (error_local); @@ -98,7 +97,7 @@ egg_console_kit_stop (EggConsoleKit *console, GError **error) ret = dbus_g_proxy_call (console->priv->proxy_manager, "Stop", &error_local, G_TYPE_INVALID, G_TYPE_INVALID); if (!ret) { - egg_warning ("Couldn't stop: %s", error_local->message); + g_warning ("Couldn't stop: %s", error_local->message); if (error != NULL) *error = g_error_new (1, 0, "%s", error_local->message); g_error_free (error_local); @@ -122,7 +121,7 @@ egg_console_kit_suspend (EggConsoleKit *console, GError **error) G_TYPE_BOOLEAN, TRUE, G_TYPE_INVALID, G_TYPE_INVALID); if (!ret) { - egg_warning ("Couldn't suspend: %s", error_local->message); + g_warning ("Couldn't suspend: %s", error_local->message); if (error != NULL) *error = g_error_new (1, 0, "%s", error_local->message); g_error_free (error_local); @@ -146,7 +145,7 @@ egg_console_kit_hibernate (EggConsoleKit *console, GError **error) G_TYPE_BOOLEAN, TRUE, G_TYPE_INVALID, G_TYPE_INVALID); if (!ret) { - egg_warning ("Couldn't hibernate: %s", error_local->message); + g_warning ("Couldn't hibernate: %s", error_local->message); if (error != NULL) *error = g_error_new (1, 0, "%s", error_local->message); g_error_free (error_local); @@ -170,7 +169,7 @@ egg_console_kit_can_stop (EggConsoleKit *console, gboolean *can_stop, GError **e G_TYPE_INVALID, G_TYPE_BOOLEAN, can_stop, G_TYPE_INVALID); if (!ret) { - egg_warning ("Couldn't do CanStop: %s", error_local->message); + g_warning ("Couldn't do CanStop: %s", error_local->message); if (error != NULL) *error = g_error_new (1, 0, "%s", error_local->message); g_error_free (error_local); @@ -197,7 +196,7 @@ egg_console_kit_can_restart (EggConsoleKit *console, gboolean *can_restart, GErr G_TYPE_INVALID, G_TYPE_BOOLEAN, can_restart, G_TYPE_INVALID); if (!ret) { - egg_warning ("Couldn't do CanRestart: %s", error_local->message); + g_warning ("Couldn't do CanRestart: %s", error_local->message); if (error != NULL) *error = g_error_new (1, 0, "%s", error_local->message); g_error_free (error_local); @@ -225,7 +224,7 @@ egg_console_kit_can_suspend (EggConsoleKit *console, gboolean *can_suspend, GErr G_TYPE_INVALID, G_TYPE_STRING, &retval, G_TYPE_INVALID); if (!ret) { - egg_warning ("Couldn't do CanSuspend: %s", error_local->message); + g_warning ("Couldn't do CanSuspend: %s", error_local->message); if (error != NULL) *error = g_error_new (1, 0, "%s", error_local->message); g_error_free (error_local); @@ -256,7 +255,7 @@ egg_console_kit_can_hibernate (EggConsoleKit *console, gboolean *can_hibernate, G_TYPE_INVALID, G_TYPE_STRING, &retval, G_TYPE_INVALID); if (!ret) { - egg_warning ("Couldn't do CanHibernate: %s", error_local->message); + g_warning ("Couldn't do CanHibernate: %s", error_local->message); if (error != NULL) *error = g_error_new (1, 0, "%s", error_local->message); g_error_free (error_local); @@ -283,7 +282,7 @@ egg_console_kit_is_local (EggConsoleKit *console) /* maybe console kit does not know about our session */ if (console->priv->proxy_session == NULL) { - egg_warning ("no ConsoleKit session"); + g_warning ("no ConsoleKit session"); goto out; } @@ -318,7 +317,7 @@ egg_console_kit_is_active (EggConsoleKit *console) /* maybe console kit does not know about our session */ if (console->priv->proxy_session == NULL) { - egg_warning ("no ConsoleKit session"); + g_warning ("no ConsoleKit session"); goto out; } @@ -343,7 +342,7 @@ out: static void egg_console_kit_active_changed_cb (DBusGProxy *proxy, gboolean active, EggConsoleKit *console) { - egg_debug ("emitting active: %i", active); + g_debug ("emitting active: %i", active); g_signal_emit (console, signals [EGG_CONSOLE_KIT_ACTIVE_CHANGED], 0, active); } @@ -382,7 +381,7 @@ egg_console_kit_init (EggConsoleKit *console) /* connect to D-Bus */ console->priv->connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error); if (console->priv->connection == NULL) { - egg_warning ("Failed to connect to the D-Bus daemon: %s", error->message); + g_warning ("Failed to connect to the D-Bus daemon: %s", error->message); g_error_free (error); goto out; } @@ -392,7 +391,7 @@ egg_console_kit_init (EggConsoleKit *console) dbus_g_proxy_new_for_name (console->priv->connection, CONSOLEKIT_NAME, CONSOLEKIT_MANAGER_PATH, CONSOLEKIT_MANAGER_INTERFACE); if (console->priv->proxy_manager == NULL) { - egg_warning ("cannot connect to ConsoleKit"); + g_warning ("cannot connect to ConsoleKit"); goto out; } @@ -404,18 +403,18 @@ egg_console_kit_init (EggConsoleKit *console) DBUS_TYPE_G_OBJECT_PATH, &console->priv->session_id, G_TYPE_INVALID); if (!ret) { - egg_warning ("Failed to get session for pid %i: %s", pid, error->message); + g_warning ("Failed to get session for pid %i: %s", pid, error->message); g_error_free (error); goto out; } - egg_debug ("ConsoleKit session ID: %s", console->priv->session_id); + g_debug ("ConsoleKit session ID: %s", console->priv->session_id); /* connect to session */ console->priv->proxy_session = dbus_g_proxy_new_for_name (console->priv->connection, CONSOLEKIT_NAME, console->priv->session_id, CONSOLEKIT_SESSION_INTERFACE); if (console->priv->proxy_session == NULL) { - egg_warning ("cannot connect to: %s", console->priv->session_id); + g_warning ("cannot connect to: %s", console->priv->session_id); goto out; } dbus_g_proxy_add_signal (console->priv->proxy_session, "ActiveChanged", G_TYPE_BOOLEAN, G_TYPE_INVALID); |