summaryrefslogtreecommitdiff
path: root/src/gpm-phone.c
diff options
context:
space:
mode:
authorrbuj <[email protected]>2020-02-14 07:54:19 +0100
committerraveit65 <[email protected]>2020-03-09 15:26:43 +0100
commit33e52564affb7fbc50ad68a08c43c9f70e7d1bb4 (patch)
tree9ac72ec71977ec83ab647b502dbf4bd4a9639a1f /src/gpm-phone.c
parent9f3d2d0986a6130b1cefc84caae161d75b4f56ba (diff)
downloadmate-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/gpm-phone.c')
-rw-r--r--src/gpm-phone.c33
1 files changed, 16 insertions, 17 deletions
diff --git a/src/gpm-phone.c b/src/gpm-phone.c
index c73008d..ac97dce 100644
--- a/src/gpm-phone.c
+++ b/src/gpm-phone.c
@@ -28,7 +28,6 @@
#include <dbus/dbus-glib.h>
#include "gpm-phone.h"
-#include "egg-debug.h"
#include "gpm-marshal.h"
static void gpm_phone_finalize (GObject *object);
@@ -40,7 +39,7 @@ struct GpmPhonePrivate
guint watch_id;
gboolean present;
guint percentage;
- gboolean onac;
+ gboolean onac;
};
enum {
@@ -69,14 +68,14 @@ gpm_phone_coldplug (GpmPhone *phone)
g_return_val_if_fail (GPM_IS_PHONE (phone), FALSE);
if (phone->priv->proxy == NULL) {
- egg_warning ("not connected");
+ g_warning ("not connected");
return FALSE;
}
ret = dbus_g_proxy_call (phone->priv->proxy, "Coldplug", &error,
G_TYPE_INVALID, G_TYPE_INVALID);
if (error != NULL) {
- egg_warning ("DEBUG: ERROR: %s", error->message);
+ g_warning ("DEBUG: ERROR: %s", error->message);
g_error_free (error);
}
@@ -141,11 +140,11 @@ gpm_phone_battery_state_changed (DBusGProxy *proxy, guint idx, guint percentage,
{
g_return_if_fail (GPM_IS_PHONE (phone));
- egg_debug ("got BatteryStateChanged %i = %i (%i)", idx, percentage, on_ac);
+ g_debug ("got BatteryStateChanged %i = %i (%i)", idx, percentage, on_ac);
phone->priv->percentage = percentage;
phone->priv->onac = on_ac;
phone->priv->present = TRUE;
- egg_debug ("emitting device-refresh : (%i)", idx);
+ g_debug ("emitting device-refresh : (%i)", idx);
g_signal_emit (phone, signals [DEVICE_REFRESH], 0, idx);
}
@@ -156,9 +155,9 @@ gpm_phone_num_batteries_changed (DBusGProxy *proxy, guint number, GpmPhone *phon
{
g_return_if_fail (GPM_IS_PHONE (phone));
- egg_debug ("got NumberBatteriesChanged %i", number);
+ g_debug ("got NumberBatteriesChanged %i", number);
if (number > 1) {
- egg_warning ("number not 0 or 1, not valid!");
+ g_warning ("number not 0 or 1, not valid!");
return;
}
@@ -167,13 +166,13 @@ gpm_phone_num_batteries_changed (DBusGProxy *proxy, guint number, GpmPhone *phon
phone->priv->present = FALSE;
phone->priv->percentage = 0;
phone->priv->onac = FALSE;
- egg_debug ("emitting device-removed : (%i)", 0);
+ g_debug ("emitting device-removed : (%i)", 0);
g_signal_emit (phone, signals [DEVICE_REMOVED], 0, 0);
return;
}
if (phone->priv->present) {
- egg_warning ("duplicate NumberBatteriesChanged with no change");
+ g_warning ("duplicate NumberBatteriesChanged with no change");
return;
}
@@ -181,7 +180,7 @@ gpm_phone_num_batteries_changed (DBusGProxy *proxy, guint number, GpmPhone *phon
phone->priv->present = TRUE;
phone->priv->percentage = 0;
phone->priv->onac = FALSE;
- egg_debug ("emitting device-added : (%i)", 0);
+ g_debug ("emitting device-added : (%i)", 0);
g_signal_emit (phone, signals [DEVICE_ADDED], 0, 0);
}
@@ -233,18 +232,18 @@ gpm_phone_service_appeared_cb (GDBusConnection *connection,
g_return_if_fail (GPM_IS_PHONE (phone));
if (phone->priv->connection == NULL) {
- egg_debug ("get connection");
+ g_debug ("get connection");
g_clear_error (&error);
phone->priv->connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
if (error != NULL) {
- egg_warning ("Could not connect to DBUS daemon: %s", error->message);
+ g_warning ("Could not connect to DBUS daemon: %s", error->message);
g_error_free (error);
phone->priv->connection = NULL;
return;
}
}
if (phone->priv->proxy == NULL) {
- egg_debug ("get proxy");
+ g_debug ("get proxy");
g_clear_error (&error);
phone->priv->proxy = dbus_g_proxy_new_for_name_owner (phone->priv->connection,
MATE_PHONE_MANAGER_DBUS_SERVICE,
@@ -252,7 +251,7 @@ gpm_phone_service_appeared_cb (GDBusConnection *connection,
MATE_PHONE_MANAGER_DBUS_INTERFACE,
&error);
if (error != NULL) {
- egg_warning ("Cannot connect, maybe the daemon is not running: %s", error->message);
+ g_warning ("Cannot connect, maybe the daemon is not running: %s", error->message);
g_error_free (error);
phone->priv->proxy = NULL;
return;
@@ -291,13 +290,13 @@ gpm_phone_service_vanished_cb (GDBusConnection *connection,
g_return_if_fail (GPM_IS_PHONE (phone));
if (phone->priv->proxy != NULL) {
- egg_debug ("removing proxy");
+ g_debug ("removing proxy");
g_object_unref (phone->priv->proxy);
phone->priv->proxy = NULL;
if (phone->priv->present) {
phone->priv->present = FALSE;
phone->priv->percentage = 0;
- egg_debug ("emitting device-removed : (%i)", 0);
+ g_debug ("emitting device-removed : (%i)", 0);
g_signal_emit (phone, signals [DEVICE_REMOVED], 0, 0);
}
}