From 5a75c358a7d887e9fe63cd255a50826b3eb5d91d Mon Sep 17 00:00:00 2001
From: Ali Abdallah <ali@ali-xfce.org>
Date: Fri, 6 Nov 2009 19:30:58 +0100
Subject: [PATCH] Make debugging doesn't depend on configuration+add --debug in
the command line for debugging output.
---
common/xfpm-debug.c | 61 +++++++++++++++++++++++++++++-----------
common/xfpm-debug.h | 42 +++++++++++++++++----------
settings/xfpm-settings.c | 2 +-
src/xfpm-backlight.c | 5 ++--
src/xfpm-battery.c | 4 +--
src/xfpm-button.c | 10 +++----
src/xfpm-disks.c | 9 +++---
src/xfpm-dkp.c | 10 +++----
src/xfpm-dpms.c | 13 +++++----
src/xfpm-inhibit.c | 15 +++++-----
src/xfpm-main.c | 11 ++++++--
src/xfpm-manager.c | 18 ++++++------
src/xfpm-xfconf.c | 7 +++--
13 files changed, 129 insertions(+), 78 deletions(-)
diff --git a/common/xfpm-debug.c b/common/xfpm-debug.c
index 7228926c..af193cce 100644
--- a/common/xfpm-debug.c
+++ b/common/xfpm-debug.c
@@ -28,31 +28,51 @@
#include <stdio.h>
#include <string.h>
#include <stdarg.h>
+#include <unistd.h>
#include "xfpm-debug.h"
-#if defined(DEBUG) && defined(G_HAVE_ISO_VARARGS)
+static gboolean enable_debug = FALSE;
-void xfpm_debug_enum (const gchar *func, const gchar *file, gint line,
- const gchar *text, gint v_enum, GType type)
-{
- gchar *content = NULL;
- GValue __value__ = { 0, };
+#if defined(G_HAVE_ISO_VARARGS)
- g_value_init (&__value__, type);
- g_value_set_enum (&__value__, v_enum);
+void
+xfpm_debug (const char *func, const char *file, int line, const char *format, ...)
+{
+ va_list args;
- content = g_strdup_value_contents (&__value__);
+ if ( !enable_debug )
+ return;
+
+ va_start (args, format);
+
+ fprintf (stdout, "TRACE[%s:%d] %s(): ", file, line, func);
+ vfprintf (stdout, format, args);
+ fprintf (stdout, "\n");
- fprintf(stdout, "TRACE[%s:%d] %s(): %s : %s", file, line , func, text, content);
- fprintf(stdout, "\n");
+ va_end (args);
+
+}
+
+void
+xfpm_warn (const char *func, const char *file, int line, const char *format, ...)
+{
+ va_list args;
+
+ if ( !enable_debug )
+ return;
+
+ va_start (args, format);
- g_value_unset (&__value__);
- g_free (content);
+ fprintf(stdout, "TRACE[%s:%d] %s(): ", file, line, func);
+ fprintf (stdout, "***WARNING***: ");
+ vfprintf (stdout, format, args);
+ fprintf (stdout, "\n");
+ va_end (args);
}
-void xfpm_debug_enum_full (const gchar *func, const gchar *file, gint line,
- gint v_enum, GType type, const gchar *format, ...)
+void xfpm_debug_enum (const gchar *func, const gchar *file, gint line,
+ gint v_enum, GType type, const gchar *format, ...)
{
va_list args;
gchar *buffer;
@@ -60,6 +80,9 @@ void xfpm_debug_enum_full (const gchar *func, const gchar *file, gint line,
gchar *content = NULL;
GValue __value__ = { 0, };
+ if ( !enable_debug )
+ return;
+
g_value_init (&__value__, type);
g_value_set_enum (&__value__, v_enum);
@@ -78,4 +101,10 @@ void xfpm_debug_enum_full (const gchar *func, const gchar *file, gint line,
g_free (buffer);
}
-#endif /* #ifdef DEBUG && defined(G_HAVE_ISO_VARARGS)*/
+#endif /*defined(G_HAVE_ISO_VARARGS)*/
+
+void xfpm_debug_init (gboolean debug)
+{
+ g_print ("Debugging=%d\n", debug);
+ enable_debug = debug;
+}
diff --git a/common/xfpm-debug.h b/common/xfpm-debug.h
index ff4cace2..d18c970a 100644
--- a/common/xfpm-debug.h
+++ b/common/xfpm-debug.h
@@ -30,36 +30,48 @@
G_BEGIN_DECLS
-#if defined(DEBUG) && defined(G_HAVE_ISO_VARARGS)
+#if defined(G_HAVE_ISO_VARARGS)
-#define XFPM_DEBUG_ENUM(_text, _value, _type)\
- xfpm_debug_enum (__func__, __FILE__, __LINE__, _text, _value, _type)
+#define XFPM_DEBUG(...)\
+ xfpm_debug (__func__, __FILE__, __LINE__, __VA_ARGS__)
-#define XFPM_DEBUG_ENUM_FULL(_value, _type, ...)\
- xfpm_debug_enum_full (__func__, __FILE__, __LINE__, _value, _type, __VA_ARGS__)
+#define XFPM_WARNING(...)\
+ xfpm_warn (__func__, __FILE__, __LINE__, __VA_ARGS__)
+
+#define XFPM_DEBUG_ENUM(_value, _type, ...)\
+ xfpm_debug_enum (__func__, __FILE__, __LINE__, _value, _type, __VA_ARGS__)
-void xfpm_debug_enum (const gchar *func,
- const gchar *file,
- gint line,
- const gchar *text,
- gint v_enum,
- GType type);
-void xfpm_debug_enum_full (const gchar *func,
+void xfpm_debug_enum (const gchar *func,
const gchar *file,
gint line,
gint v_enum,
GType type,
const gchar *format,
- ...);
+ ...) __attribute__((format (printf,6,7)));
+
+void xfpm_debug (const char *func,
+ const char *file,
+ int line,
+ const char *format,
+ ...) __attribute__((format (printf,4,5)));
+
+void xfpm_warn (const char *func,
+ const char *file,
+ int line,
+ const char *format,
+ ...) __attribute__((format (printf,4,5)));
#else
-#define XFPM_DEBUG_ENUM(_text, _value, _type)
-#define XFPM_DEBUG_ENUM_FULL(_value, _type, ...)
+#define XFPM_DEBUG(...)
+#define XFPM_WARNING(...)
+#define XFPM_DEBUG_ENUM(_value, _type, ...)
#endif
+void xfpm_debug_init (gboolean debug);
+
G_END_DECLS
#endif /* __XFPM_DEBUG_H */
diff --git a/settings/xfpm-settings.c b/settings/xfpm-settings.c
index f974f1f4..4f9cce3f 100644
--- a/settings/xfpm-settings.c
+++ b/settings/xfpm-settings.c
@@ -1583,7 +1583,7 @@ xfpm_settings_dialog_new (XfconfChannel *channel, gboolean system_laptop,
GtkWidget *allbox;
GError *error = NULL;
- g_debug ("system_laptop=%s auth_hibernate=%s auth_suspend=%s can_shutdown=%s can_suspend=%s can_hibernate=%s has_lcd_brightness=%s has_lid=%s "\
+ XFPM_DEBUG ("system_laptop=%s auth_hibernate=%s auth_suspend=%s can_shutdown=%s can_suspend=%s can_hibernate=%s has_lcd_brightness=%s has_lid=%s "\
"has_sleep_button=%s has_hibernate_button=%s has_power_button=%s can_spin_down=%s",
xfpm_bool_to_string (system_laptop), xfpm_bool_to_string (auth_hibernate),
xfpm_bool_to_string (can_shutdown), xfpm_bool_to_string (auth_suspend),
diff --git a/src/xfpm-backlight.c b/src/xfpm-backlight.c
index 194eda8a..b063e267 100644
--- a/src/xfpm-backlight.c
+++ b/src/xfpm-backlight.c
@@ -37,6 +37,7 @@
#include "xfpm-config.h"
#include "xfpm-button.h"
#include "xfpm-brightness.h"
+#include "xfpm-debug.h"
static void xfpm_backlight_finalize (GObject *object);
@@ -85,7 +86,7 @@ xfpm_backlight_dim_brightness (XfpmBacklight *backlight)
g_warning ("Unable to get current brightness level");
return;
}
- TRACE ("Current brightness level : %u", brightness->priv->last_level);
+ XFPM_DEBUG ("Current brightness level : %u", backlight->priv->last_level);
xfpm_brightness_dim_down (backlight->priv->brightness);
}
@@ -222,7 +223,7 @@ xfpm_backlight_show (XfpmBacklight *backlight, gint level)
gboolean sync;
gboolean show_popup;
- g_debug ("Level %u", level);
+ XFPM_DEBUG ("Level %u", level);
g_object_get (G_OBJECT (backlight->priv->conf),
diff --git a/src/xfpm-battery.c b/src/xfpm-battery.c
index ebc9a55a..df8b7c6f 100644
--- a/src/xfpm-battery.c
+++ b/src/xfpm-battery.c
@@ -128,7 +128,7 @@ xfpm_battery_refresh_visible (XfpmBattery *battery)
else visible = TRUE;
}
- XFPM_DEBUG_ENUM_FULL (show_icon, XFPM_TYPE_SHOW_ICON, "visible=%s", xfpm_bool_to_string (visible));
+ XFPM_DEBUG_ENUM (show_icon, XFPM_TYPE_SHOW_ICON, "visible=%s", xfpm_bool_to_string (visible));
gtk_status_icon_set_visible (GTK_STATUS_ICON (battery), visible);
}
@@ -158,7 +158,7 @@ xfpm_battery_refresh_icon (XfpmBattery *battery)
{
gchar icon_name[128];
- TRACE ("Battery state %d", battery->priv->state);
+ XFPM_DEBUG ("Battery state %d", battery->priv->state);
if ( battery->priv->type == XFPM_DKP_DEVICE_TYPE_BATTERY ||
battery->priv->type == XFPM_DKP_DEVICE_TYPE_UPS )
diff --git a/src/xfpm-button.c b/src/xfpm-button.c
index 40bbb76e..1c8fabbf 100644
--- a/src/xfpm-button.c
+++ b/src/xfpm-button.c
@@ -119,7 +119,7 @@ xfpm_button_filter_x_events (GdkXEvent *xevent, GdkEvent *ev, gpointer data)
{
button = (XfpmButton *) data;
- XFPM_DEBUG_ENUM ("Key press", key, XFPM_TYPE_BUTTON_KEY);
+ XFPM_DEBUG_ENUM (key, XFPM_TYPE_BUTTON_KEY, "Key press");
g_signal_emit (G_OBJECT(button), signals[BUTTON_PRESSED], 0, key);
return GDK_FILTER_REMOVE;
@@ -184,7 +184,7 @@ xfpm_button_xevent_key (XfpmButton *button, guint keysym , XfpmButtonKey key)
return FALSE;
}
- XFPM_DEBUG_ENUM_FULL (key, XFPM_TYPE_BUTTON_KEY, "Grabbed key %li ", (long int) keycode);
+ XFPM_DEBUG_ENUM (key, XFPM_TYPE_BUTTON_KEY, "Grabbed key %li ", (long int) keycode);
xfpm_key_map [key].key_code = keycode;
xfpm_key_map [key].key = key;
@@ -231,7 +231,7 @@ xfpm_button_hal_emit_signals (XfpmButton *button, const gchar *condition, const
if ( g_strcmp0 (condition, "ButtonPressed") )
return;
- TRACE ("Button press condition %s detail %s", condition, detail);
+ XFPM_DEBUG ("Button press condition %s detail %s", condition, detail);
if ( !g_strcmp0 (detail, "power") )
g_signal_emit (G_OBJECT (button), signals [BUTTON_PRESSED], 0, BUTTON_POWER_OFF);
@@ -321,7 +321,7 @@ xfpm_button_setup_failed_hal (XfpmButton *button)
gchar **udi;
int i;
- g_debug ("Getting missing buttons from HAL");
+ XFPM_DEBUG ("Getting missing buttons from HAL");
manager = hal_manager_new ();
@@ -339,7 +339,7 @@ xfpm_button_setup_failed_hal (XfpmButton *button)
hal_manager_free_string_array (udi);
if ( button->priv->array )
- g_debug ("Mapped HAL buttons : %u", button->priv->array->len);
+ XFPM_DEBUG ("Mapped HAL buttons : %u", button->priv->array->len);
}
#endif /* WITH_HAL*/
diff --git a/src/xfpm-disks.c b/src/xfpm-disks.c
index a9ccd144..d9728a28 100644
--- a/src/xfpm-disks.c
+++ b/src/xfpm-disks.c
@@ -33,6 +33,7 @@
#include "xfpm-xfconf.h"
#include "xfpm-dkp.h"
#include "xfpm-config.h"
+#include "xfpm-debug.h"
static void xfpm_disks_finalize (GObject *object);
@@ -71,7 +72,7 @@ xfpm_disks_disable_spin_down_timeouts (XfpmDisks *disks)
disks->priv->set = FALSE;
- g_debug ("Clearing spin down timeout");
+ XFPM_DEBUG ("Clearing spin down timeout");
dbus_g_proxy_call (disks->priv->proxy, "DriveUnsetAllSpindownTimeouts", &error,
G_TYPE_STRING, disks->priv->cookie,
@@ -97,7 +98,7 @@ xfpm_disks_enable_spin_down_timeouts (XfpmDisks *disks, gint timeout)
disks->priv->set = TRUE;
- g_debug ("Setting spin down timeout %d", timeout);
+ XFPM_DEBUG ("Setting spin down timeout %d", timeout);
dbus_g_proxy_call (disks->priv->proxy, "DriveSetAllSpindownTimeouts", &error,
G_TYPE_INT, timeout,
@@ -143,7 +144,7 @@ xfpm_disks_set_spin_timeouts (XfpmDisks *disks)
NULL);
}
- g_debug ("On Battery=%d spin_down_enabled=%d timeout=%d\n", on_battery, enabled, timeout);
+ XFPM_DEBUG ("On Battery=%d spin_down_enabled=%d timeout=%d\n", on_battery, enabled, timeout);
if ( !enabled )
{
@@ -162,7 +163,7 @@ xfpm_disks_get_is_auth_to_spin (XfpmDisks *disks)
disks->priv->can_spin = xfpm_polkit_check_auth (disks->priv->polkit,
"org.freedesktop.devicekit.disks.drive-set-spindown");
- g_debug ("Is auth to spin down disks : %d", disks->priv->can_spin);
+ XFPM_DEBUG ("Is auth to spin down disks : %d", disks->priv->can_spin);
}
static void
diff --git a/src/xfpm-dkp.c b/src/xfpm-dkp.c
index 1dc8b441..69a63433 100644
--- a/src/xfpm-dkp.c
+++ b/src/xfpm-dkp.c
@@ -354,7 +354,7 @@ xfpm_dkp_sleep (XfpmDkp *dkp, const gchar *sleep, gboolean force)
{
if ( g_error_matches (error, DBUS_GERROR, DBUS_GERROR_NO_REPLY) )
{
- g_debug ("D-Bus time out, but should be harmless");
+ XFPM_DEBUG ("D-Bus time out, but should be harmless");
}
else
{
@@ -780,8 +780,8 @@ xfpm_dkp_system_on_low_power (XfpmDkp *dkp, XfpmBattery *battery)
CRITICAL_BATT_ACTION_CFG, &critical_action,
NULL);
- TRACE ("System is running on low power");
- XFPM_DEBUG_ENUM ("Critical battery action", critical_action, XFPM_TYPE_SHUTDOWN_REQUEST);
+ XFPM_DEBUG ("System is running on low power");
+ XFPM_DEBUG_ENUM (critical_action, XFPM_TYPE_SHUTDOWN_REQUEST, "Critical battery action");
if ( critical_action == XFPM_DO_NOTHING )
{
@@ -890,7 +890,7 @@ xfpm_dkp_add_device (XfpmDkp *dkp, const gchar *object_path)
{
GtkStatusIcon *battery;
DBusGProxy *proxy;
- TRACE ("Battery device detected at : %s", object_path);
+ XFPM_DEBUG ("Battery device detected at : %s", object_path);
proxy = dbus_g_proxy_new_for_name (dkp->priv->bus,
DKP_NAME,
object_path,
@@ -951,7 +951,7 @@ xfpm_dkp_get_power_devices (XfpmDkp *dkp)
for ( i = 0; i < array->len; i++)
{
const gchar *object_path = ( const gchar *) g_ptr_array_index (array, i);
- TRACE ("Power device detected at : %s", object_path);
+ XFPM_DEBUG ("Power device detected at : %s", object_path);
xfpm_dkp_add_device (dkp, object_path);
}
diff --git a/src/xfpm-dpms.c b/src/xfpm-dpms.c
index 3c7992c6..c1e2f26c 100644
--- a/src/xfpm-dpms.c
+++ b/src/xfpm-dpms.c
@@ -37,6 +37,7 @@
#include "xfpm-dkp.h"
#include "xfpm-xfconf.h"
#include "xfpm-config.h"
+#include "xfpm-debug.h"
#ifdef HAVE_DPMS
@@ -70,7 +71,7 @@ xfpm_dpms_set_timeouts (XfpmDpms *dpms, guint16 standby, guint16 suspend, guint
if ( standby != x_standby || suspend != x_suspend || off != x_off )
{
- TRACE ("Settings dpms: standby=%d suspend=%d off=%d\n", standby, suspend, off);
+ XFPM_DEBUG ("Settings dpms: standby=%d suspend=%d off=%d\n", standby, suspend, off);
DPMSSetTimeouts (GDK_DISPLAY(), standby,
suspend,
off );
@@ -195,7 +196,7 @@ xfpm_dpms_settings_changed_cb (GObject *obj, GParamSpec *spec, XfpmDpms *dpms)
{
if ( g_str_has_prefix (spec->name, "dpms"))
{
- TRACE ("Configuration changed");
+ XFPM_DEBUG ("Configuration changed");
xfpm_dpms_refresh (dpms);
}
}
@@ -285,7 +286,7 @@ void xfpm_dpms_force_level (XfpmDpms *dpms, CARD16 level)
CARD16 current_level;
BOOL current_state;
- TRACE ("start");
+ XFPM_DEBUG ("start");
if ( !dpms->priv->dpms_capable )
goto out;
@@ -298,13 +299,13 @@ void xfpm_dpms_force_level (XfpmDpms *dpms, CARD16 level)
if ( !current_state )
{
- TRACE ("DPMS is disabled");
+ XFPM_DEBUG ("DPMS is disabled");
goto out;
}
if ( current_level != level )
{
- TRACE ("Forcing DPMS mode %d", level);
+ XFPM_DEBUG ("Forcing DPMS mode %d", level);
if ( !DPMSForceLevel (GDK_DISPLAY (), level ) )
{
@@ -315,7 +316,7 @@ void xfpm_dpms_force_level (XfpmDpms *dpms, CARD16 level)
}
else
{
- TRACE ("No need to change DPMS mode, current_level=%d requested_level=%d", current_level, level);
+ XFPM_DEBUG ("No need to change DPMS mode, current_level=%d requested_level=%d", current_level, level);
}
out:
diff --git a/src/xfpm-inhibit.c b/src/xfpm-inhibit.c
index aac461bc..5de6e097 100644
--- a/src/xfpm-inhibit.c
+++ b/src/xfpm-inhibit.c
@@ -36,6 +36,7 @@
#include "xfpm-inhibit.h"
#include "xfpm-dbus-monitor.h"
#include "xfpm-errors.h"
+#include "xfpm-debug.h"
static void xfpm_inhibit_finalize (GObject *object);
@@ -87,13 +88,13 @@ xfpm_inhibit_has_inhibit_changed (XfpmInhibit *inhibit)
{
if ( inhibit->priv->array->len == 0 && inhibit->priv->inhibited == TRUE )
{
- TRACE("Inhibit removed");
+ XFPM_DEBUG("Inhibit removed");
inhibit->priv->inhibited = FALSE;
g_signal_emit (G_OBJECT(inhibit), signals[HAS_INHIBIT_CHANGED], 0, inhibit->priv->inhibited);
}
else if ( inhibit->priv->array->len != 0 && inhibit->priv->inhibited == FALSE )
{
- TRACE("Inhibit added");
+ XFPM_DEBUG("Inhibit added");
inhibit->priv->inhibited = TRUE;
g_signal_emit (G_OBJECT(inhibit), signals[HAS_INHIBIT_CHANGED], 0, inhibit->priv->inhibited);
}
@@ -196,7 +197,7 @@ xfpm_inhibit_connection_lost_cb (XfpmDBusMonitor *monitor, gchar *unique_name,
if ( inhibitor )
{
- TRACE ("Application=%s with unique connection name=%s disconnected", inhibitor->app_name, inhibitor->unique_name);
+ XFPM_DEBUG ("Application=%s with unique connection name=%s disconnected", inhibitor->app_name, inhibitor->unique_name);
xfpm_inhibit_free_inhibitor (inhibit, inhibitor);
xfpm_inhibit_has_inhibit_changed (inhibit);
}
@@ -335,7 +336,7 @@ static void xfpm_inhibit_inhibit (XfpmInhibit *inhibit,
sender = dbus_g_method_get_sender (context);
cookie = xfpm_inhibit_add_application (inhibit, IN_appname, sender);
- TRACE("Inhibit send application name=%s reason=%s sender=%s", IN_appname, IN_reason ,sender);
+ XFPM_DEBUG("Inhibit send application name=%s reason=%s sender=%s", IN_appname, IN_reason ,sender);
xfpm_inhibit_has_inhibit_changed (inhibit);
@@ -349,7 +350,7 @@ static gboolean xfpm_inhibit_un_inhibit (XfpmInhibit *inhibit,
guint IN_cookie,
GError **error)
{
- TRACE("UnHibit message received");
+ XFPM_DEBUG("UnHibit message received");
if (!xfpm_inhibit_remove_application_by_cookie (inhibit, IN_cookie))
{
@@ -366,7 +367,7 @@ static gboolean xfpm_inhibit_has_inhibit (XfpmInhibit *inhibit,
gboolean *OUT_has_inhibit,
GError **error)
{
- TRACE("Has Inhibit message received");
+ XFPM_DEBUG("Has Inhibit message received");
*OUT_has_inhibit = inhibit->priv->inhibited;
@@ -380,7 +381,7 @@ static gboolean xfpm_inhibit_get_inhibitors (XfpmInhibit *inhibit,
guint i;
Inhibitor *inhibitor;
- TRACE ("Get Inhibitors message received");
+ XFPM_DEBUG ("Get Inhibitors message received");
*OUT_inhibitors = g_new (gchar *, inhibit->priv->array->len + 1);
diff --git a/src/xfpm-main.c b/src/xfpm-main.c
index c45a1d82..0f810a27 100644
--- a/src/xfpm-main.c
+++ b/src/xfpm-main.c
@@ -39,6 +39,7 @@
#include <dbus/dbus-glib-lowlevel.h>
#include "xfpm-dbus.h"
+#include "xfpm-debug.h"
#include "xfce-power-manager-dbus-client.h"
#include "xfpm-manager.h"
@@ -60,7 +61,7 @@ xfpm_quit_signal (gint sig, gpointer data)
{
XfpmManager *manager = (XfpmManager *) data;
- TRACE ("sig %d", sig);
+ XFPM_DEBUG ("sig %d", sig);
if ( sig != SIGHUP )
xfpm_manager_stop (manager);
@@ -72,7 +73,7 @@ xfpm_start (DBusGConnection *bus, const gchar *client_id)
XfpmManager *manager;
GError *error = NULL;
- TRACE ("Starting the power manager");
+ XFPM_DEBUG ("Starting the power manager");
manager = xfpm_manager_new (bus, client_id);
@@ -116,12 +117,14 @@ int main (int argc, char **argv)
gboolean version = FALSE;
gboolean reload = FALSE;
gboolean no_daemon = FALSE;
+ gboolean debug = FALSE;
gchar *client_id = NULL;
GOptionEntry option_entries[] =
{
{ "run",'r', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &run, NULL, NULL },
{ "no-daemon",'\0' , G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &no_daemon, N_("Do not daemonize"), NULL },
+ { "debug",'\0' , G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &debug, N_("Enable debugging"), NULL },
{ "restart", '\0', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &reload, N_("Restart the running instance of Xfce power manager"), NULL},
{ "customize", 'c', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &config, N_("Show the configuration dialog"), NULL },
{ "quit", 'q', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &quit, N_("Quit any running xfce power manager"), NULL },
@@ -169,8 +172,10 @@ int main (int argc, char **argv)
g_printerr ("\n");
return EXIT_FAILURE;
}
+
+ xfpm_debug_init (debug);
- if ( no_daemon == FALSE && daemon(0,0) )
+ if ( debug == FALSE && no_daemon == FALSE && daemon(0,0) )
{
g_critical ("Could not daemonize");
}
diff --git a/src/xfpm-manager.c b/src/xfpm-manager.c
index 89b75172..cc34dc03 100644
--- a/src/xfpm-manager.c
+++ b/src/xfpm-manager.c
@@ -155,7 +155,7 @@ xfpm_manager_release_names (XfpmManager *manager)
static gboolean
xfpm_manager_quit (XfpmManager *manager)
{
- TRACE ("Exiting");
+ XFPM_DEBUG ("Exiting");
xfpm_manager_release_names (manager);
gtk_main_quit ();
@@ -167,7 +167,7 @@ xfpm_manager_system_bus_connection_changed_cb (XfpmDBusMonitor *monitor, gboolea
{
if ( connected == TRUE )
{
- TRACE ("System bus connection changed to TRUE, restarting the power manager");
+ XFPM_DEBUG ("System bus connection changed to TRUE, restarting the power manager");
xfpm_manager_quit (manager);
g_spawn_command_line_async ("xfce4-power-manager", NULL);
}
@@ -250,7 +250,7 @@ xfpm_manager_button_pressed_cb (XfpmButton *bt, XfpmButtonKey type, XfpmManager
{
XfpmShutdownRequest req = XFPM_DO_NOTHING;
- XFPM_DEBUG_ENUM ("Received button press event", type, XFPM_TYPE_BUTTON_KEY);
+ XFPM_DEBUG_ENUM (type, XFPM_TYPE_BUTTON_KEY, "Received button press event");
if ( type == BUTTON_MON_BRIGHTNESS_DOWN || type == BUTTON_MON_BRIGHTNESS_UP )
return;
@@ -278,7 +278,7 @@ xfpm_manager_button_pressed_cb (XfpmButton *bt, XfpmButtonKey type, XfpmManager
g_return_if_reached ();
}
- XFPM_DEBUG_ENUM ("Shutdown request : ", req, XFPM_TYPE_SHUTDOWN_REQUEST);
+ XFPM_DEBUG_ENUM (req, XFPM_TYPE_SHUTDOWN_REQUEST, "Shutdown request : ");
if ( req == XFPM_ASK )
xfpm_manager_ask_shutdown (manager);
@@ -308,7 +308,7 @@ xfpm_manager_lid_changed_cb (XfpmDkp *dkp, gboolean lid_is_closed, XfpmManager *
if ( lid_is_closed )
{
- XFPM_DEBUG_ENUM ("LID close event", action, XFPM_TYPE_LID_TRIGGER_ACTION);
+ XFPM_DEBUG_ENUM (action, XFPM_TYPE_LID_TRIGGER_ACTION, "LID close event");
if ( action == LID_TRIGGER_NOTHING )
{
@@ -333,7 +333,7 @@ xfpm_manager_lid_changed_cb (XfpmDkp *dkp, gboolean lid_is_closed, XfpmManager *
}
else
{
- XFPM_DEBUG_ENUM ("LID opened", action, XFPM_TYPE_LID_TRIGGER_ACTION);
+ XFPM_DEBUG_ENUM (action, XFPM_TYPE_LID_TRIGGER_ACTION, "LID opened");
xfpm_dpms_force_level (manager->priv->dpms, DPMSModeOn);
}
}
@@ -434,7 +434,7 @@ out:
void xfpm_manager_stop (XfpmManager *manager)
{
- TRACE ("Stopping");
+ XFPM_DEBUG ("Stopping");
g_return_if_fail (XFPM_IS_MANAGER (manager));
xfpm_manager_quit (manager);
}
@@ -480,7 +480,7 @@ xfpm_manager_dbus_init (XfpmManager *manager)
static gboolean
xfpm_manager_dbus_quit (XfpmManager *manager, GError **error)
{
- TRACE("Quit message received\n");
+ XFPM_DEBUG("Quit message received\n");
xfpm_manager_quit (manager);
@@ -490,7 +490,7 @@ xfpm_manager_dbus_quit (XfpmManager *manager, GError **error)
static gboolean xfpm_manager_dbus_restart (XfpmManager *manager,
GError **error)
{
- TRACE("Restart message received");
+ XFPM_DEBUG("Restart message received");
xfpm_manager_quit (manager);
diff --git a/src/xfpm-xfconf.c b/src/xfpm-xfconf.c
index fd562f04..e1b83662 100644
--- a/src/xfpm-xfconf.c
+++ b/src/xfpm-xfconf.c
@@ -36,6 +36,7 @@
#include "xfpm-enum-glib.h"
#include "xfpm-enum.h"
#include "xfpm-enum-types.h"
+#include "xfpm-debug.h"
static void xfpm_xfconf_finalize (GObject *object);
@@ -152,13 +153,13 @@ xfpm_xfconf_load (XfpmXfconf *conf, gboolean channel_valid)
{
if ( !xfconf_channel_get_property (conf->priv->channel, prop_name, &value) )
{
- TRACE ("Using default configuration for %s", specs[i]->name);
+ XFPM_DEBUG ("Using default configuration for %s", specs[i]->name);
g_param_value_set_default (specs[i], &value);
}
}
else
{
- TRACE ("Using default configuration for %s", specs[i]->name);
+ XFPM_DEBUG ("Using default configuration for %s", specs[i]->name);
g_param_value_set_default (specs[i], &value);
}
g_free (prop_name);
@@ -179,7 +180,7 @@ xfpm_xfconf_property_changed_cb (XfconfChannel *channel, gchar *property,
if ( !g_str_has_prefix (property, PROPERTIES_PREFIX) || strlen (property) <= strlen (PROPERTIES_PREFIX) )
return;
- TRACE("Property modified: %s\n", property);
+ XFPM_DEBUG("Property modified: %s\n", property);
g_object_set_property (G_OBJECT (conf), property + strlen (PROPERTIES_PREFIX), value);
}
--
GitLab