summaryrefslogtreecommitdiff
path: root/applets/brightness
diff options
context:
space:
mode:
Diffstat (limited to 'applets/brightness')
-rw-r--r--applets/brightness/Makefile.am2
-rw-r--r--applets/brightness/brightness-applet.c29
-rw-r--r--applets/brightness/egg-debug.c308
-rw-r--r--applets/brightness/egg-debug.h83
-rw-r--r--applets/brightness/gpm-common.c1
5 files changed, 14 insertions, 409 deletions
diff --git a/applets/brightness/Makefile.am b/applets/brightness/Makefile.am
index 4560164..aeba0ad 100644
--- a/applets/brightness/Makefile.am
+++ b/applets/brightness/Makefile.am
@@ -28,8 +28,6 @@ libexec_PROGRAMS=mate-brightness-applet
mate_brightness_applet_SOURCES = \
brightness-applet.c \
- egg-debug.c \
- egg-debug.h \
gpm-common.c \
gpm-common.h
diff --git a/applets/brightness/brightness-applet.c b/applets/brightness/brightness-applet.c
index 168d849..3525d2b 100644
--- a/applets/brightness/brightness-applet.c
+++ b/applets/brightness/brightness-applet.c
@@ -35,7 +35,6 @@
#include <glib-object.h>
#include <dbus/dbus-glib.h>
-#include "egg-debug.h"
#include "gpm-common.h"
#define GPM_TYPE_BRIGHTNESS_APPLET (gpm_brightness_applet_get_type ())
@@ -121,7 +120,7 @@ gpm_applet_get_brightness (GpmBrightnessApplet *applet)
guint policy_brightness;
if (applet->proxy == NULL) {
- egg_warning ("not connected\n");
+ g_warning ("not connected\n");
return FALSE;
}
@@ -130,14 +129,14 @@ gpm_applet_get_brightness (GpmBrightnessApplet *applet)
G_TYPE_UINT, &policy_brightness,
G_TYPE_INVALID);
if (error) {
- egg_debug ("ERROR: %s\n", error->message);
+ g_debug ("ERROR: %s\n", error->message);
g_error_free (error);
}
if (ret) {
applet->level = policy_brightness;
} else {
/* abort as the DBUS method failed */
- egg_warning ("GetBrightness failed!\n");
+ g_warning ("GetBrightness failed!\n");
}
return ret;
@@ -154,7 +153,7 @@ gpm_applet_set_brightness (GpmBrightnessApplet *applet)
gboolean ret;
if (applet->proxy == NULL) {
- egg_warning ("not connected");
+ g_warning ("not connected");
return FALSE;
}
@@ -163,12 +162,12 @@ gpm_applet_set_brightness (GpmBrightnessApplet *applet)
G_TYPE_INVALID,
G_TYPE_INVALID);
if (error) {
- egg_debug ("ERROR: %s", error->message);
+ g_debug ("ERROR: %s", error->message);
g_error_free (error);
}
if (!ret) {
/* abort as the DBUS method failed */
- egg_warning ("SetBrightness failed!");
+ g_warning ("SetBrightness failed!");
}
return ret;
@@ -208,9 +207,9 @@ gpm_applet_get_icon (GpmBrightnessApplet *applet)
icon, applet->size - 2, 0, NULL);
if (applet->icon == NULL) {
- egg_warning ("Cannot find %s!\n", icon);
+ g_warning ("Cannot find %s!\n", icon);
} else {
- egg_debug ("got icon %s!\n", icon);
+ g_debug ("got icon %s!\n", icon);
/* update size cache */
applet->icon_height = gdk_pixbuf_get_height (applet->icon);
applet->icon_width = gdk_pixbuf_get_width (applet->icon);
@@ -867,7 +866,7 @@ brightness_changed_cb (DBusGProxy *proxy,
guint brightness,
GpmBrightnessApplet *applet)
{
- egg_debug ("BrightnessChanged detected: %i\n", brightness);
+ g_debug ("BrightnessChanged detected: %i\n", brightness);
applet->level = brightness;
}
@@ -880,18 +879,18 @@ gpm_brightness_applet_dbus_connect (GpmBrightnessApplet *applet)
GError *error = NULL;
if (applet->connection == NULL) {
- egg_debug ("get connection\n");
+ g_debug ("get connection\n");
g_clear_error (&error);
applet->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);
applet->connection = NULL;
return FALSE;
}
}
if (applet->proxy == NULL) {
- egg_debug ("get proxy\n");
+ g_debug ("get proxy\n");
g_clear_error (&error);
applet->proxy = dbus_g_proxy_new_for_name_owner (applet->connection,
GPM_DBUS_SERVICE,
@@ -899,7 +898,7 @@ gpm_brightness_applet_dbus_connect (GpmBrightnessApplet *applet)
GPM_DBUS_INTERFACE_BACKLIGHT,
&error);
if (error != NULL) {
- egg_warning ("Cannot connect, maybe the daemon is not running: %s\n", error->message);
+ g_warning ("Cannot connect, maybe the daemon is not running: %s\n", error->message);
g_error_free (error);
applet->proxy = NULL;
return FALSE;
@@ -922,7 +921,7 @@ gboolean
gpm_brightness_applet_dbus_disconnect (GpmBrightnessApplet *applet)
{
if (applet->proxy != NULL) {
- egg_debug ("removing proxy\n");
+ g_debug ("removing proxy\n");
g_object_unref (applet->proxy);
applet->proxy = NULL;
}
diff --git a/applets/brightness/egg-debug.c b/applets/brightness/egg-debug.c
deleted file mode 100644
index 2f140f2..0000000
--- a/applets/brightness/egg-debug.c
+++ /dev/null
@@ -1,308 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2007-2008 Richard Hughes <[email protected]>
- *
- * Licensed under the GNU General Public License Version 2
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-/**
- * SECTION:egg-debug
- * @short_description: Debugging functions
- *
- * This file contains functions that can be used for debugging.
- */
-
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <glib/gprintf.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <time.h>
-#include <execinfo.h>
-
-#include "egg-debug.h"
-
-#define CONSOLE_RESET 0
-#define CONSOLE_BLACK 30
-#define CONSOLE_RED 31
-#define CONSOLE_GREEN 32
-#define CONSOLE_YELLOW 33
-#define CONSOLE_BLUE 34
-#define CONSOLE_MAGENTA 35
-#define CONSOLE_CYAN 36
-#define CONSOLE_WHITE 37
-
-static gint fd = -1;
-
-/**
- * pk_set_console_mode:
- **/
-static void
-pk_set_console_mode (guint console_code)
-{
- gchar command[13];
-
- /* don't put extra commands into logs */
- if (!egg_debug_is_console ())
- return;
-
- /* Command is the control command to the terminal */
- g_snprintf (command, 13, "%c[%dm", 0x1B, console_code);
- printf ("%s", command);
-}
-
-/**
- * egg_debug_backtrace:
- **/
-void
-egg_debug_backtrace (void)
-{
- void *call_stack[512];
- int call_stack_size;
- char **symbols;
- int i = 1;
-
- call_stack_size = backtrace (call_stack, G_N_ELEMENTS (call_stack));
- symbols = backtrace_symbols (call_stack, call_stack_size);
- if (symbols != NULL) {
- pk_set_console_mode (CONSOLE_RED);
- g_print ("Traceback:\n");
- while (i < call_stack_size) {
- g_print ("\t%s\n", symbols[i]);
- i++;
- }
- pk_set_console_mode (CONSOLE_RESET);
- free (symbols);
- }
-}
-
-/**
- * pk_log_line:
- **/
-static void
-pk_log_line (const gchar *buffer)
-{
- ssize_t count;
- /* open a file */
- if (fd == -1) {
- /* ITS4: ignore, /var/log/foo is owned by root, and this is just debug text */
- fd = open (EGG_LOG_FILE, O_WRONLY|O_APPEND|O_CREAT, 0777);
- if (fd == -1)
- g_error ("could not open log: '%s'", EGG_LOG_FILE);
- }
-
- /* ITS4: ignore, debug text always NULL terminated */
- count = write (fd, buffer, strlen (buffer));
- if (count == -1)
- g_warning ("could not write %s", buffer);
- /* newline */
- count = write (fd, "\n", 1);
- if (count == -1)
- g_warning ("could not write newline");
-}
-
-/**
- * pk_print_line:
- **/
-static void
-pk_print_line (const gchar *func, const gchar *file, const int line, const gchar *buffer, guint color)
-{
- gchar *str_time;
- gchar *header;
- time_t the_time;
- GThread *thread;
-
- time (&the_time);
- str_time = g_new0 (gchar, 255);
- strftime (str_time, 254, "%H:%M:%S", localtime (&the_time));
- thread = g_thread_self ();
-
- /* generate header text */
- header = g_strdup_printf ("TI:%s\tTH:%p\tFI:%s\tFN:%s,%d", str_time, thread, file, func, line);
- g_free (str_time);
-
- /* always in light green */
- pk_set_console_mode (CONSOLE_GREEN);
- printf ("%s\n", header);
-
- /* different colors according to the severity */
- pk_set_console_mode (color);
- printf (" - %s\n", buffer);
- pk_set_console_mode (CONSOLE_RESET);
-
- /* log to a file */
- if (egg_debug_is_logging ()) {
- pk_log_line (header);
- pk_log_line (buffer);
- }
-
- /* flush this output, as we need to debug */
- fflush (stdout);
-
- g_free (header);
-}
-
-/**
- * egg_debug_real:
- **/
-void
-egg_debug_real (const gchar *func, const gchar *file, const int line, const gchar *format, ...)
-{
- va_list args;
- gchar *buffer = NULL;
-
- if (!egg_debug_enabled ())
- return;
-
- va_start (args, format);
- g_vasprintf (&buffer, format, args);
- va_end (args);
-
- pk_print_line (func, file, line, buffer, CONSOLE_BLUE);
-
- g_free(buffer);
-}
-
-/**
- * egg_warning_real:
- **/
-void
-egg_warning_real (const gchar *func, const gchar *file, const int line, const gchar *format, ...)
-{
- va_list args;
- gchar *buffer = NULL;
-
- if (!egg_debug_enabled ())
- return;
-
- va_start (args, format);
- g_vasprintf (&buffer, format, args);
- va_end (args);
-
- /* do extra stuff for a warning */
- if (!egg_debug_is_console ())
- printf ("*** WARNING ***\n");
- pk_print_line (func, file, line, buffer, CONSOLE_RED);
-
- g_free(buffer);
-}
-
-/**
- * egg_error_real:
- **/
-void
-egg_error_real (const gchar *func, const gchar *file, const int line, const gchar *format, ...)
-{
- va_list args;
- gchar *buffer = NULL;
-
- va_start (args, format);
- g_vasprintf (&buffer, format, args);
- va_end (args);
-
- /* do extra stuff for a warning */
- if (!egg_debug_is_console ())
- printf ("*** ERROR ***\n");
- pk_print_line (func, file, line, buffer, CONSOLE_RED);
- g_free(buffer);
-
- /* we want to fix this! */
- egg_debug_backtrace ();
-
- exit (1);
-}
-
-/**
- * egg_debug_enabled:
- *
- * Returns: TRUE if we have debugging enabled
- **/
-gboolean
-egg_debug_enabled (void)
-{
- const gchar *env;
- env = g_getenv (EGG_VERBOSE);
- return (g_strcmp0 (env, "1") == 0);
-}
-
-/**
- * egg_debug_is_logging:
- *
- * Returns: TRUE if we have logging enabled
- **/
-gboolean
-egg_debug_is_logging (void)
-{
- const gchar *env;
- env = g_getenv (EGG_LOGGING);
- return (g_strcmp0 (env, "1") == 0);
-}
-
-/**
- * egg_debug_is_console:
- *
- * Returns: TRUE if we have debugging enabled
- **/
-gboolean
-egg_debug_is_console (void)
-{
- const gchar *env;
- env = g_getenv (EGG_CONSOLE);
- return (g_strcmp0 (env, "1") == 0);
-}
-
-/**
- * egg_debug_set_logging:
- **/
-void
-egg_debug_set_logging (gboolean enabled)
-{
- if (enabled)
- g_setenv (EGG_LOGGING, "1", TRUE);
- else
- g_setenv (EGG_LOGGING, "0", TRUE);
-
- if (egg_debug_is_logging ())
- egg_debug ("logging to %s", EGG_LOG_FILE);
-}
-
-/**
- * egg_debug_init:
- * @debug: If we should print out verbose logging
- **/
-void
-egg_debug_init (gboolean debug)
-{
- /* check if we are on console */
- if (isatty (fileno (stdout)) == 1)
- g_setenv (EGG_CONSOLE, "1", FALSE);
- else
- g_setenv (EGG_CONSOLE, "0", FALSE);
- if (debug)
- g_setenv (EGG_VERBOSE, "1", FALSE);
- else
- g_setenv (EGG_VERBOSE, "0", FALSE);
- egg_debug ("Verbose debugging %i (on console %i)%s", egg_debug_enabled (), egg_debug_is_console (), EGG_VERBOSE);
-}
-
diff --git a/applets/brightness/egg-debug.h b/applets/brightness/egg-debug.h
deleted file mode 100644
index fdfb02b..0000000
--- a/applets/brightness/egg-debug.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2007-2008 Richard Hughes <[email protected]>
- *
- * Licensed under the GNU General Public License Version 2
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef __EGG_DEBUG_H
-#define __EGG_DEBUG_H
-
-#include <stdarg.h>
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-/**
- * egg_debug:
- *
- * Non critical debugging
- */
-#define egg_debug(...) egg_debug_real (__func__, __FILE__, __LINE__, __VA_ARGS__)
-
-/**
- * egg_warning:
- *
- * Important debugging
- */
-#define egg_warning(...) egg_warning_real (__func__, __FILE__, __LINE__, __VA_ARGS__)
-
-/**
- * egg_error:
- *
- * Critical debugging, with exit
- */
-#define egg_error(...) egg_error_real (__func__, __FILE__, __LINE__, __VA_ARGS__)
-
-#elif defined(__GNUC__) && __GNUC__ >= 3
-#define egg_debug(...) egg_debug_real (__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
-#define egg_warning(...) egg_warning_real (__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
-#define egg_error(...) egg_error_real (__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
-#else
-#define egg_debug(...)
-#define egg_warning(...)
-#define egg_error(...)
-#endif
-
-void egg_debug_init (gboolean debug);
-void egg_debug_set_logging (gboolean enabled);
-gboolean egg_debug_enabled (void);
-gboolean egg_debug_is_logging (void);
-gboolean egg_debug_is_console (void);
-void egg_debug_backtrace (void);
-void egg_debug_real (const gchar *func,
- const gchar *file,
- int line,
- const gchar *format, ...) __attribute__((format (printf,4,5)));
-void egg_warning_real (const gchar *func,
- const gchar *file,
- int line,
- const gchar *format, ...) __attribute__((format (printf,4,5)));
-void egg_error_real (const gchar *func,
- const gchar *file,
- int line,
- const gchar *format, ...) G_GNUC_NORETURN __attribute__((format (printf,4,5)));
-
-G_END_DECLS
-
-#endif /* __EGG_DEBUG_H */
diff --git a/applets/brightness/gpm-common.c b/applets/brightness/gpm-common.c
index 9ebfbf0..da278d0 100644
--- a/applets/brightness/gpm-common.c
+++ b/applets/brightness/gpm-common.c
@@ -27,7 +27,6 @@
#include <gdk/gdk.h>
#include <gtk/gtk.h>
-#include "egg-debug.h"
#include "gpm-common.h"
/**
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-06 06:24:02 +0000