[gnome-packagekit] Port from EggDebug to the built-in GLib logging framework
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-packagekit] Port from EggDebug to the built-in GLib logging framework
- Date: Tue, 26 Oct 2010 12:54:52 +0000 (UTC)
commit a88ca840d415f161f6fa8a49d9c0b413175f3da1
Author: Richard Hughes <richard hughsie com>
Date: Tue Oct 26 14:54:44 2010 +0100
Port from EggDebug to the built-in GLib logging framework
po/POTFILES.in | 2 +-
src/Makefile.am | 13 +-
src/cc-update-panel.c | 38 ++--
src/egg-console-kit.c | 25 +-
src/egg-dbus-monitor.c | 9 +-
src/egg-debug.c | 482 ---------------------------------------
src/egg-debug.h | 83 -------
src/egg-markdown.c | 27 +--
src/egg-string.c | 3 +-
src/gpk-animated-icon.c | 22 +-
src/gpk-application.c | 147 ++++++------
src/gpk-auto-refresh.c | 53 ++---
src/gpk-cell-renderer-info.c | 2 -
src/gpk-cell-renderer-restart.c | 2 -
src/gpk-cell-renderer-size.c | 1 -
src/gpk-cell-renderer-uri.c | 5 +-
src/gpk-check-update.c | 144 ++++++------
src/gpk-common.c | 20 +-
src/gpk-dbus-service.c | 15 +-
src/gpk-dbus-task.c | 116 +++++-----
src/gpk-dbus.c | 22 +-
src/gpk-debug.c | 193 ++++++++++++++++
src/gpk-debug.h | 31 +++
src/gpk-desktop.c | 19 +-
src/gpk-dialog.c | 5 +-
src/gpk-enum.c | 31 ++--
src/gpk-error.c | 4 +-
src/gpk-firmware.c | 70 +++---
src/gpk-gnome.c | 5 +-
src/gpk-hardware.c | 27 +--
src/gpk-helper-chooser.c | 10 +-
src/gpk-helper-run.c | 31 ++--
src/gpk-inhibit.c | 13 +-
src/gpk-install-catalog.c | 11 +-
src/gpk-install-local-file.c | 11 +-
src/gpk-install-mime-type.c | 11 +-
src/gpk-install-package-name.c | 11 +-
src/gpk-install-provide-file.c | 11 +-
src/gpk-language.c | 2 -
src/gpk-log.c | 21 +-
src/gpk-modal-dialog.c | 29 +--
src/gpk-self-test.c | 3 +-
src/gpk-service-pack.c | 24 +-
src/gpk-session.c | 41 ++--
src/gpk-task.c | 22 +-
src/gpk-update-icon.c | 6 +-
src/gpk-update-viewer.c | 77 +++----
src/gpk-vendor.c | 7 +-
src/gpk-watch.c | 91 ++++----
src/gpk-x11.c | 15 +-
50 files changed, 829 insertions(+), 1234 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f836ccf..d02886b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -47,5 +47,5 @@ src/gpk-update-icon.c
src/gpk-update-viewer.c
src/gpk-dbus-service.c
src/gpk-watch.c
-src/egg-debug.c
+src/gpk-debug.c
diff --git a/src/Makefile.am b/src/Makefile.am
index bb79cec..34c43c3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,6 +27,7 @@ INCLUDES = \
-DLOCALEDIR=\""$(localedir)"\" \
-DVERSION="\"$(VERSION)\"" \
-DGPK_DATA=\"$(pkgdatadir)\" \
+ -DG_LOG_DOMAIN=\"GnomePackageKit\" \
$(NULL)
ccpanelsdir = $(PANELS_DIR)
@@ -48,8 +49,6 @@ bin_PROGRAMS = \
noinst_LIBRARIES = libgpkshared.a
libgpkshared_a_SOURCES = \
- egg-debug.c \
- egg-debug.h \
egg-string.c \
egg-string.h \
egg-markdown.c \
@@ -58,6 +57,8 @@ libgpkshared_a_SOURCES = \
egg-console-kit.h \
egg-dbus-monitor.c \
egg-dbus-monitor.h \
+ gpk-debug.c \
+ gpk-debug.h \
gpk-enum.c \
gpk-enum.h \
gpk-x11.c \
@@ -206,8 +207,8 @@ gpk_service_pack_LDADD = \
$(NULL)
libupdate_la_SOURCES = \
- egg-debug.h \
- egg-debug.c \
+ gpk-debug.h \
+ gpk-debug.c \
gpk-animated-icon.c \
gpk-animated-icon.h \
gpk-enum.c \
@@ -289,8 +290,8 @@ gpk_self_test_SOURCES = \
egg-string.h \
egg-markdown.c \
egg-markdown.h \
- egg-debug.c \
- egg-debug.h \
+ gpk-debug.c \
+ gpk-debug.h \
gpk-enum.c \
gpk-enum.h \
gpk-common.c \
diff --git a/src/cc-update-panel.c b/src/cc-update-panel.c
index b179931..4f277c9 100644
--- a/src/cc-update-panel.c
+++ b/src/cc-update-panel.c
@@ -27,8 +27,6 @@
#include <gtk/gtk.h>
#include <packagekit-glib2/packagekit.h>
-#include "egg-debug.h"
-
#include "cc-update-panel.h"
#include "gpk-common.h"
@@ -64,7 +62,6 @@ static void cc_update_panel_finalize (GObject *object);
#define CC_UPDATE_PREFS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CC_TYPE_UPDATE_PANEL, CcUpdatePanelPrivate))
-
/* TRANSLATORS: check once an hour */
#define PK_FREQ_HOURLY_TEXT _("Hourly")
/* TRANSLATORS: check once a day */
@@ -108,7 +105,7 @@ cc_update_panel_check_now_cb (GtkWidget *widget, CcUpdatePanel *panel)
command = g_build_filename (BINDIR, "gpk-update-viewer", NULL);
ret = g_spawn_command_line_async (command, &error);
if (!ret) {
- egg_warning ("Couldn't execute %s: %s", command, error->message);
+ g_warning ("Couldn't execute %s: %s", command, error->message);
g_error_free (error);
}
g_free (command);
@@ -135,7 +132,7 @@ cc_update_panel_update_freq_combo_changed (GtkWidget *widget, CcUpdatePanel *pan
else
g_assert (FALSE);
- egg_debug ("Changing %s to %i", GPK_SETTINGS_FREQUENCY_GET_UPDATES, freq);
+ g_debug ("Changing %s to %i", GPK_SETTINGS_FREQUENCY_GET_UPDATES, freq);
g_settings_set_int (panel->priv->settings, GPK_SETTINGS_FREQUENCY_GET_UPDATES, freq);
g_free (value);
}
@@ -159,7 +156,7 @@ cc_update_panel_upgrade_freq_combo_changed (GtkWidget *widget, CcUpdatePanel *pa
else
g_assert (FALSE);
- egg_debug ("Changing %s to %i", GPK_SETTINGS_FREQUENCY_GET_UPGRADES, freq);
+ g_debug ("Changing %s to %i", GPK_SETTINGS_FREQUENCY_GET_UPGRADES, freq);
g_settings_set_int (panel->priv->settings, GPK_SETTINGS_FREQUENCY_GET_UPGRADES, freq);
g_free (value);
}
@@ -191,7 +188,7 @@ cc_update_panel_update_freq_combo_setup (CcUpdatePanel *panel)
widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "combobox_check"));
is_writable = g_settings_is_writable (panel->priv->settings, GPK_SETTINGS_FREQUENCY_GET_UPDATES);
value = g_settings_get_int (panel->priv->settings, GPK_SETTINGS_FREQUENCY_GET_UPDATES);
- egg_debug ("value from settings %i", value);
+ g_debug ("value from settings %i", value);
/* do we have permission to write? */
gtk_widget_set_sensitive (widget, is_writable);
@@ -230,7 +227,7 @@ cc_update_panel_upgrade_freq_combo_setup (CcUpdatePanel *panel)
widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "combobox_upgrade"));
is_writable = g_settings_is_writable (panel->priv->settings, GPK_SETTINGS_FREQUENCY_GET_UPGRADES);
value = g_settings_get_int (panel->priv->settings, GPK_SETTINGS_FREQUENCY_GET_UPGRADES);
- egg_debug ("value from settings %i", value);
+ g_debug ("value from settings %i", value);
/* do we have permission to write? */
gtk_widget_set_sensitive (widget, is_writable);
@@ -302,7 +299,6 @@ cc_update_panel_notify_network_state_cb (PkControl *control, GParamSpec *pspec,
gtk_widget_hide (widget);
}
-
/**
* cc_update_panel_find_iter_model_cb:
**/
@@ -436,7 +432,7 @@ cc_update_panel_progress_cb (PkProgress *progress, PkProgressType type, CcUpdate
g_object_get (progress,
"status", &panel->priv->status,
NULL);
- egg_debug ("now %s", pk_status_enum_to_text (panel->priv->status));
+ g_debug ("now %s", pk_status_enum_to_text (panel->priv->status));
if (panel->priv->status == PK_STATUS_ENUM_FINISHED) {
/* we've not yet shown, so don't bother */
@@ -503,7 +499,7 @@ cc_update_panel_repo_enable_cb (GObject *object, GAsyncResult *res, CcUpdatePane
/* get the results */
results = pk_client_generic_finish (client, res, &error);
if (results == NULL) {
- egg_warning ("failed to get set repo: %s", error->message);
+ g_warning ("failed to get set repo: %s", error->message);
g_error_free (error);
goto out;
}
@@ -511,7 +507,7 @@ cc_update_panel_repo_enable_cb (GObject *object, GAsyncResult *res, CcUpdatePane
/* check error code */
error_code = pk_results_get_error_code (results);
if (error_code != NULL) {
- egg_warning ("failed to set repo: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ g_warning ("failed to set repo: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
window = GTK_WINDOW (gtk_builder_get_object (panel->priv->builder, "dialog_prefs"));
/* TRANSLATORS: for one reason or another, we could not enable or disable a software source */
gpk_error_dialog_modal (window, _("Failed to change status"),
@@ -542,7 +538,7 @@ gpk_misc_enabled_toggled (GtkCellRendererToggle *cell, gchar *path_str, CcUpdate
/* do we have the capability? */
if (pk_bitfield_contain (panel->priv->roles, PK_ROLE_ENUM_REPO_ENABLE) == FALSE) {
- egg_debug ("can't change state");
+ g_debug ("can't change state");
goto out;
}
@@ -563,7 +559,7 @@ gpk_misc_enabled_toggled (GtkCellRendererToggle *cell, gchar *path_str, CcUpdate
-1);
/* set the repo */
- egg_debug ("setting %s to %i", repo_id, enabled);
+ g_debug ("setting %s to %i", repo_id, enabled);
pk_client_repo_enable_async (panel->priv->client, repo_id, enabled,
panel->priv->cancellable,
(PkProgressCallback) cc_update_panel_progress_cb, panel,
@@ -618,10 +614,10 @@ gpk_repos_treeview_clicked_cb (GtkTreeSelection *selection, CcUpdatePanel *panel
/* This will only work in single or browse selection mode! */
if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
gtk_tree_model_get (model, &iter, GPK_COLUMN_ID, &repo_id, -1);
- egg_debug ("selected row is: %s", repo_id);
+ g_debug ("selected row is: %s", repo_id);
g_free (repo_id);
} else {
- egg_debug ("no row selected");
+ g_debug ("no row selected");
}
}
@@ -649,7 +645,7 @@ cc_update_panel_get_repo_list_cb (GObject *object, GAsyncResult *res, CcUpdatePa
/* get the results */
results = pk_client_generic_finish (client, res, &error);
if (results == NULL) {
- egg_warning ("failed to get repo list: %s", error->message);
+ g_warning ("failed to get repo list: %s", error->message);
g_error_free (error);
goto out;
}
@@ -657,7 +653,7 @@ cc_update_panel_get_repo_list_cb (GObject *object, GAsyncResult *res, CcUpdatePa
/* check error code */
error_code = pk_results_get_error_code (results);
if (error_code != NULL) {
- egg_warning ("failed to get repo list: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ g_warning ("failed to get repo list: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
window = GTK_WINDOW (gtk_builder_get_object (panel->priv->builder, "dialog_prefs"));
/* TRANSLATORS: for one reason or another, we could not get the list of sources */
gpk_error_dialog_modal (window, _("Failed to get the list of sources"),
@@ -676,7 +672,7 @@ cc_update_panel_get_repo_list_cb (GObject *object, GAsyncResult *res, CcUpdatePa
"description", &description,
"enabled", &enabled,
NULL);
- egg_debug ("repo = %s:%s:%i", repo_id, description, enabled);
+ g_debug ("repo = %s:%s:%i", repo_id, description, enabled);
cc_update_panel_model_get_iter (panel, model, &iter, repo_id);
gtk_list_store_set (panel->priv->list_store, &iter,
GPK_COLUMN_ENABLED, enabled,
@@ -721,7 +717,7 @@ cc_update_panel_repo_list_refresh (CcUpdatePanel *panel)
model = gtk_tree_view_get_model (treeview);
cc_update_panel_mark_nonactive (panel, model);
- egg_debug ("refreshing list");
+ g_debug ("refreshing list");
widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "checkbutton_detail"));
show_details = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
if (!show_details)
@@ -878,7 +874,7 @@ cc_update_panel_init (CcUpdatePanel *panel)
panel->priv->builder = gtk_builder_new ();
retval = gtk_builder_add_from_file (panel->priv->builder, GPK_DATA "/gpk-prefs.ui", &error);
if (retval == 0) {
- egg_warning ("failed to load ui: %s", error->message);
+ g_warning ("failed to load ui: %s", error->message);
g_error_free (error);
goto out;
}
diff --git a/src/egg-console-kit.c b/src/egg-console-kit.c
index c0ded18..a278ba7 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);
g_set_error (error, 1, 0, "%s", error_local->message);
g_error_free (error_local);
}
@@ -97,7 +96,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);
g_set_error (error, 1, 0, "%s", error_local->message);
g_error_free (error_local);
}
@@ -120,7 +119,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);
g_set_error (error, 1, 0, "%s", error_local->message);
g_error_free (error_local);
/* CanStop was only added in new versions of ConsoleKit,
@@ -146,7 +145,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);
g_set_error (error, 1, 0, "%s", error_local->message);
g_error_free (error_local);
/* CanRestart was only added in new versions of ConsoleKit,
@@ -172,7 +171,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;
}
@@ -207,7 +206,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;
}
@@ -232,7 +231,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);
}
@@ -271,7 +270,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;
}
@@ -281,7 +280,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;
}
@@ -293,18 +292,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);
diff --git a/src/egg-dbus-monitor.c b/src/egg-dbus-monitor.c
index 2d91146..7e8c545 100644
--- a/src/egg-dbus-monitor.c
+++ b/src/egg-dbus-monitor.c
@@ -29,7 +29,6 @@
#include <dbus/dbus-glib-lowlevel.h>
#include <dbus/dbus.h>
-#include "egg-debug.h"
#include "egg-dbus-monitor.h"
static void egg_dbus_monitor_finalize (GObject *object);
@@ -121,7 +120,7 @@ egg_dbus_monitor_assign (EggDbusMonitor *monitor, EggDbusMonitorType bus_type, c
g_return_val_if_fail (service != NULL, FALSE);
if (monitor->priv->proxy != NULL) {
- egg_warning ("already assigned!");
+ g_warning ("already assigned!");
return FALSE;
}
@@ -134,7 +133,7 @@ egg_dbus_monitor_assign (EggDbusMonitor *monitor, EggDbusMonitorType bus_type, c
else
monitor->priv->connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
if (error != NULL) {
- egg_warning ("Cannot connect to bus: %s", error->message);
+ g_warning ("Cannot connect to bus: %s", error->message);
g_error_free (error);
return FALSE;
}
@@ -144,7 +143,7 @@ egg_dbus_monitor_assign (EggDbusMonitor *monitor, EggDbusMonitorType bus_type, c
DBUS_INTERFACE_DBUS,
&error);
if (error != NULL) {
- egg_warning ("Cannot connect to DBUS: %s", error->message);
+ g_warning ("Cannot connect to DBUS: %s", error->message);
g_error_free (error);
return FALSE;
}
@@ -183,7 +182,7 @@ egg_dbus_monitor_is_connected (EggDbusMonitor *monitor)
dbus_error_init (&error);
ret = dbus_bus_name_has_owner (conn, monitor->priv->service, &error);
if (dbus_error_is_set (&error)) {
- egg_debug ("error: %s", error.message);
+ g_debug ("error: %s", error.message);
dbus_error_free (&error);
}
diff --git a/src/egg-markdown.c b/src/egg-markdown.c
index 9a32d37..52a7961 100644
--- a/src/egg-markdown.c
+++ b/src/egg-markdown.c
@@ -24,7 +24,6 @@
#include <string.h>
#include <glib.h>
-#include "egg-debug.h"
#include "egg-string.h"
#include "egg-markdown.h"
@@ -625,7 +624,7 @@ egg_markdown_flush_pending (EggMarkdown *self)
self->priv->line_count++;
}
- egg_debug ("adding '%s'", temp);
+ g_debug ("adding '%s'", temp);
/* clear */
g_string_truncate (self->priv->pending, 0);
@@ -644,7 +643,7 @@ egg_markdown_to_text_line_process (EggMarkdown *self, const gchar *line)
/* blank */
ret = egg_markdown_to_text_line_is_blank (line);
if (ret) {
- egg_debug ("blank: '%s'", line);
+ g_debug ("blank: '%s'", line);
egg_markdown_flush_pending (self);
/* a new line after a list is the end of list, not a gap */
if (self->priv->mode != EGG_MARKDOWN_MODE_BULLETT)
@@ -656,7 +655,7 @@ egg_markdown_to_text_line_process (EggMarkdown *self, const gchar *line)
/* header1_type2 */
ret = egg_markdown_to_text_line_is_header1_type2 (line);
if (ret) {
- egg_debug ("header1_type2: '%s'", line);
+ g_debug ("header1_type2: '%s'", line);
if (self->priv->mode == EGG_MARKDOWN_MODE_PARA)
self->priv->mode = EGG_MARKDOWN_MODE_H1;
goto out;
@@ -665,7 +664,7 @@ egg_markdown_to_text_line_process (EggMarkdown *self, const gchar *line)
/* header2_type2 */
ret = egg_markdown_to_text_line_is_header2_type2 (line);
if (ret) {
- egg_debug ("header2_type2: '%s'", line);
+ g_debug ("header2_type2: '%s'", line);
if (self->priv->mode == EGG_MARKDOWN_MODE_PARA)
self->priv->mode = EGG_MARKDOWN_MODE_H2;
goto out;
@@ -674,7 +673,7 @@ egg_markdown_to_text_line_process (EggMarkdown *self, const gchar *line)
/* rule */
ret = egg_markdown_to_text_line_is_rule (line);
if (ret) {
- egg_debug ("rule: '%s'", line);
+ g_debug ("rule: '%s'", line);
egg_markdown_flush_pending (self);
self->priv->mode = EGG_MARKDOWN_MODE_RULE;
ret = egg_markdown_add_pending (self, self->priv->tags.rule);
@@ -684,7 +683,7 @@ egg_markdown_to_text_line_process (EggMarkdown *self, const gchar *line)
/* bullett */
ret = egg_markdown_to_text_line_is_bullett (line);
if (ret) {
- egg_debug ("bullett: '%s'", line);
+ g_debug ("bullett: '%s'", line);
egg_markdown_flush_pending (self);
self->priv->mode = EGG_MARKDOWN_MODE_BULLETT;
ret = egg_markdown_add_pending (self, &line[2]);
@@ -694,7 +693,7 @@ egg_markdown_to_text_line_process (EggMarkdown *self, const gchar *line)
/* header1 */
ret = egg_markdown_to_text_line_is_header1 (line);
if (ret) {
- egg_debug ("header1: '%s'", line);
+ g_debug ("header1: '%s'", line);
egg_markdown_flush_pending (self);
self->priv->mode = EGG_MARKDOWN_MODE_H1;
ret = egg_markdown_add_pending_header (self, &line[2]);
@@ -704,7 +703,7 @@ egg_markdown_to_text_line_process (EggMarkdown *self, const gchar *line)
/* header2 */
ret = egg_markdown_to_text_line_is_header2 (line);
if (ret) {
- egg_debug ("header2: '%s'", line);
+ g_debug ("header2: '%s'", line);
egg_markdown_flush_pending (self);
self->priv->mode = EGG_MARKDOWN_MODE_H2;
ret = egg_markdown_add_pending_header (self, &line[3]);
@@ -718,7 +717,7 @@ egg_markdown_to_text_line_process (EggMarkdown *self, const gchar *line)
}
/* add to pending */
- egg_debug ("continue: '%s'", line);
+ g_debug ("continue: '%s'", line);
ret = egg_markdown_add_pending (self, line);
out:
/* if we failed to add, we don't know the mode */
@@ -786,7 +785,7 @@ egg_markdown_set_output (EggMarkdown *self, EggMarkdownOutput output)
/* unknown */
} else {
- egg_warning ("unknown output enum");
+ g_warning ("unknown output enum");
ret = FALSE;
}
@@ -855,7 +854,7 @@ egg_markdown_parse (EggMarkdown *self, const gchar *markdown)
g_return_val_if_fail (EGG_IS_MARKDOWN (self), NULL);
g_return_val_if_fail (self->priv->output != EGG_MARKDOWN_OUTPUT_UNKNOWN, NULL);
- egg_debug ("input='%s'", markdown);
+ g_debug ("input='%s'", markdown);
/* process */
self->priv->mode = EGG_MARKDOWN_MODE_UNKNOWN;
@@ -883,7 +882,7 @@ egg_markdown_parse (EggMarkdown *self, const gchar *markdown)
g_string_truncate (self->priv->pending, 0);
g_string_truncate (self->priv->processed, 0);
- egg_debug ("output='%s'", temp);
+ g_debug ("output='%s'", temp);
return temp;
}
@@ -1019,7 +1018,6 @@ egg_markdown_test (EggTest *test)
ret = egg_markdown_to_text_line_is_blank ("ccccccccc");
egg_test_title_assert (test, "is blank (full)", !ret);
-
/************************************************************
**************** replace **************
************************************************************/
@@ -1140,7 +1138,6 @@ egg_markdown_test (EggTest *test)
egg_test_failed (test, "failed, got '%s', expected '%s'", text, markdown_expected);
g_free (text);
-
/************************************************************/
markdown = "this is http://www.hughsie.com/with_spaces_in_url inline link\n";
markdown_expected = "this is <tt>http://www.hughsie.com/with_spaces_in_url</tt> inline link";
diff --git a/src/egg-string.c b/src/egg-string.c
index 204e6d9..63b1ef4 100644
--- a/src/egg-string.c
+++ b/src/egg-string.c
@@ -42,7 +42,6 @@
#include <glib.h>
-#include "egg-debug.h"
#include "egg-string.h"
/**
@@ -183,7 +182,7 @@ egg_strvequal (gchar **id1, gchar **id2)
return TRUE;
if (id1 == NULL || id2 == NULL) {
- egg_debug ("GStrv compare invalid '%p' and '%p'", id1, id2);
+ g_debug ("GStrv compare invalid '%p' and '%p'", id1, id2);
return FALSE;
}
diff --git a/src/gpk-animated-icon.c b/src/gpk-animated-icon.c
index c94c176..f07a712 100644
--- a/src/gpk-animated-icon.c
+++ b/src/gpk-animated-icon.c
@@ -26,7 +26,6 @@
#include <gtk/gtk.h>
#include <packagekit-glib2/packagekit.h>
-#include "egg-debug.h"
#include "egg-string.h"
#include "gpk-animated-icon.h"
@@ -47,7 +46,7 @@ gpk_animated_icon_free_pixbufs (GpkAnimatedIcon *icon)
/* none loaded */
if (icon->frames == NULL) {
- egg_debug ("nothing to free");
+ g_debug ("nothing to free");
return FALSE;
}
@@ -94,7 +93,7 @@ gpk_animated_icon_set_filename_tile (GpkAnimatedIcon *icon, GtkIconSize size, co
/* have we already set the same icon */
if (g_strcmp0 (icon->filename, name) == 0) {
- egg_debug ("already set the same icon name %s, ignoring", name);
+ g_debug ("already set the same icon name %s, ignoring", name);
return FALSE;
}
@@ -110,7 +109,7 @@ gpk_animated_icon_set_filename_tile (GpkAnimatedIcon *icon, GtkIconSize size, co
gpk_animated_icon_free_pixbufs (icon);
}
- egg_debug ("loading from %s", name);
+ g_debug ("loading from %s", name);
screen = gdk_screen_get_default ();
settings = gtk_settings_get_for_screen (screen);
gtk_icon_size_lookup_for_settings (settings, size, &w, &h);
@@ -118,7 +117,7 @@ gpk_animated_icon_set_filename_tile (GpkAnimatedIcon *icon, GtkIconSize size, co
pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), name, w, 0, NULL);
/* can't load from gnome-icon-theme */
if (pixbuf == NULL) {
- egg_warning ("can't load %s", name);
+ g_warning ("can't load %s", name);
return FALSE;
}
@@ -154,7 +153,6 @@ gpk_animated_icon_set_filename_tile (GpkAnimatedIcon *icon, GtkIconSize size, co
return TRUE;
}
-
/**
* gpk_animated_icon_visible_notify_cb:
**/
@@ -164,7 +162,7 @@ gpk_animated_icon_visible_notify_cb (GObject *object, GParamSpec *param, GpkAnim
gboolean ret;
g_object_get (object, "visible", &ret, NULL);
if (!ret && icon->animation_id != 0) {
- egg_debug ("disabling animation as hidden");
+ g_debug ("disabling animation as hidden");
gpk_animated_icon_enable_animation (icon, FALSE);
}
}
@@ -179,11 +177,11 @@ gpk_animated_icon_update (GpkAnimatedIcon *icon)
/* debug so we can catch polling */
if (rate_limit++ % 20 == 0)
- egg_debug ("polling check");
+ g_debug ("polling check");
/* have we loaded a file */
if (icon->frames == NULL) {
- egg_warning ("no frames to process");
+ g_warning ("no frames to process");
return FALSE;
}
@@ -204,7 +202,7 @@ gpk_animated_icon_set_frame_delay (GpkAnimatedIcon *icon, guint delay_ms)
{
g_return_val_if_fail (GPK_IS_ANIMATED_ICON (icon), FALSE);
- egg_debug ("frame delay set to %ims", delay_ms);
+ g_debug ("frame delay set to %ims", delay_ms);
icon->frame_delay = delay_ms;
/* do we have to change a running icon? */
@@ -227,7 +225,7 @@ gpk_animated_icon_enable_animation (GpkAnimatedIcon *icon, gboolean enabled)
if (!enabled) {
if (icon->animation_id == 0) {
- egg_debug ("ignoring stop on stopped icon");
+ g_debug ("ignoring stop on stopped icon");
return FALSE;
}
@@ -238,7 +236,7 @@ gpk_animated_icon_enable_animation (GpkAnimatedIcon *icon, gboolean enabled)
/* don't double queue */
if (icon->animation_id != 0) {
- egg_debug ("ignoring start on started icon");
+ g_debug ("ignoring start on started icon");
return FALSE;
}
diff --git a/src/gpk-application.c b/src/gpk-application.c
index 32fd5e1..f2c39ea 100644
--- a/src/gpk-application.c
+++ b/src/gpk-application.c
@@ -35,8 +35,6 @@
#include <string.h>
#include <unistd.h>
-#include "egg-debug.h"
-#include "egg-debug.h"
#include "egg-markdown.h"
#include "egg-string.h"
@@ -50,6 +48,7 @@
#include "gpk-gnome.h"
#include "gpk-helper-run.h"
#include "gpk-task.h"
+#include "gpk-debug.h"
typedef enum {
GPK_SEARCH_NAME,
@@ -251,7 +250,7 @@ gpk_application_packages_checkbox_invert (gpointer user_data)
selection = gtk_tree_view_get_selection (treeview);
ret = gtk_tree_selection_get_selected (selection, &model, &iter);
if (!ret) {
- egg_warning ("no selection");
+ g_warning ("no selection");
return;
}
@@ -369,7 +368,6 @@ gpk_application_set_buttons_apply_clear (gpointer user_data)
}
}
-
/**
* gpk_application_get_selected_package:
**/
@@ -387,7 +385,7 @@ gpk_application_get_selected_package (gchar **package_id, gchar **summary)
selection = gtk_tree_view_get_selection (treeview);
ret = gtk_tree_selection_get_selected (selection, &model, &iter);
if (!ret) {
- egg_warning ("no selection");
+ g_warning ("no selection");
goto out;
}
@@ -420,7 +418,7 @@ gpk_application_install (gpointer user_data)
/* get selection */
ret = gpk_application_get_selected_package (&package_id_selected, &summary_selected);
if (!ret) {
- egg_warning ("no package selected");
+ g_warning ("no package selected");
goto out;
}
@@ -428,7 +426,7 @@ gpk_application_install (gpointer user_data)
if (action == GPK_ACTION_REMOVE) {
ret = pk_package_sack_remove_package_by_id (package_sack, package_id_selected);
if (ret) {
- egg_debug ("removed %s from package array", package_id_selected);
+ g_debug ("removed %s from package array", package_id_selected);
/* correct buttons */
gpk_application_allow_install (FALSE);
@@ -437,14 +435,14 @@ gpk_application_install (gpointer user_data)
gpk_application_set_buttons_apply_clear (NULL);
return TRUE;
}
- egg_warning ("wrong mode and not in array");
+ g_warning ("wrong mode and not in array");
return FALSE;
}
/* already added */
package = pk_package_sack_find_by_id (package_sack, package_id_selected);
if (package != NULL) {
- egg_warning ("already added");
+ g_warning ("already added");
goto out;
}
@@ -513,7 +511,7 @@ gpk_application_get_files_cb (PkClient *client, GAsyncResult *res, gpointer user
/* get the results */
results = pk_client_generic_finish (client, res, &error);
if (results == NULL) {
- egg_warning ("failed to get files: %s", error->message);
+ g_warning ("failed to get files: %s", error->message);
g_error_free (error);
goto out;
}
@@ -521,7 +519,7 @@ gpk_application_get_files_cb (PkClient *client, GAsyncResult *res, gpointer user
/* check error code */
error_code = pk_results_get_error_code (results);
if (error_code != NULL) {
- egg_warning ("failed to get files: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ g_warning ("failed to get files: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
/* if obvious message, don't tell the user */
if (pk_error_get_code (error_code) != PK_ERROR_ENUM_TRANSACTION_CANCELLED) {
@@ -543,7 +541,7 @@ gpk_application_get_files_cb (PkClient *client, GAsyncResult *res, gpointer user
/* get selection */
ret = gpk_application_get_selected_package (&package_id_selected, NULL);
if (!ret) {
- egg_warning ("no package selected");
+ g_warning ("no package selected");
goto out;
}
@@ -634,7 +632,7 @@ gpk_application_progress_cb (PkProgress *progress, PkProgressType type, gpointer
NULL);
if (type == PK_PROGRESS_TYPE_STATUS) {
- egg_debug ("now %s", pk_status_enum_to_text (status));
+ g_debug ("now %s", pk_status_enum_to_text (status));
if (status == PK_STATUS_ENUM_FINISHED) {
/* re-enable UI */
@@ -703,7 +701,7 @@ gpk_application_menu_files_cb (GtkAction *_action, gpointer user_data)
/* get selection */
ret = gpk_application_get_selected_package (&package_id_selected, NULL);
if (!ret) {
- egg_warning ("no package selected");
+ g_warning ("no package selected");
goto out;
}
@@ -734,7 +732,7 @@ gpk_application_remove (gpointer user_data)
/* get selection */
ret = gpk_application_get_selected_package (&package_id_selected, &summary_selected);
if (!ret) {
- egg_warning ("no package selected");
+ g_warning ("no package selected");
goto out;
}
@@ -742,7 +740,7 @@ gpk_application_remove (gpointer user_data)
if (action == GPK_ACTION_INSTALL) {
ret = pk_package_sack_remove_package_by_id (package_sack, package_id_selected);
if (ret) {
- egg_debug ("removed %s from package array", package_id_selected);
+ g_debug ("removed %s from package array", package_id_selected);
/* correct buttons */
gpk_application_allow_install (TRUE);
@@ -751,14 +749,14 @@ gpk_application_remove (gpointer user_data)
gpk_application_set_buttons_apply_clear (NULL);
return TRUE;
}
- egg_warning ("wrong mode and not in array");
+ g_warning ("wrong mode and not in array");
return FALSE;
}
/* already added */
ret = (pk_package_sack_find_by_id (package_sack, package_id_selected) == NULL);
if (!ret) {
- egg_warning ("already added");
+ g_warning ("already added");
goto out;
}
@@ -821,7 +819,7 @@ gpk_application_menu_run_cb (GtkAction *_action, gpointer user_data)
selection = gtk_tree_view_get_selection (treeview);
ret = gtk_tree_selection_get_selected (selection, &model, &iter);
if (!ret) {
- egg_warning ("no selection");
+ g_warning ("no selection");
return;
}
@@ -862,7 +860,7 @@ gpk_application_get_requires_cb (PkClient *client, GAsyncResult *res, gpointer u
/* get the results */
results = pk_client_generic_finish (client, res, &error);
if (results == NULL) {
- egg_warning ("failed to get requires: %s", error->message);
+ g_warning ("failed to get requires: %s", error->message);
g_error_free (error);
goto out;
}
@@ -870,7 +868,7 @@ gpk_application_get_requires_cb (PkClient *client, GAsyncResult *res, gpointer u
/* check error code */
error_code = pk_results_get_error_code (results);
if (error_code != NULL) {
- egg_warning ("failed to get requires: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ g_warning ("failed to get requires: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
/* if obvious message, don't tell the user */
if (pk_error_get_code (error_code) != PK_ERROR_ENUM_TRANSACTION_CANCELLED) {
@@ -884,7 +882,7 @@ gpk_application_get_requires_cb (PkClient *client, GAsyncResult *res, gpointer u
/* get selection */
ret = gpk_application_get_selected_package (&package_id_selected, NULL);
if (!ret) {
- egg_warning ("no package selected");
+ g_warning ("no package selected");
goto out;
}
@@ -948,7 +946,7 @@ gpk_application_menu_requires_cb (GtkAction *_action, gpointer user_data)
/* get selection */
ret = gpk_application_get_selected_package (&package_id_selected, NULL);
if (!ret) {
- egg_warning ("no package selected");
+ g_warning ("no package selected");
goto out;
}
@@ -989,7 +987,7 @@ gpk_application_get_depends_cb (PkClient *client, GAsyncResult *res, gpointer us
/* get the results */
results = pk_client_generic_finish (client, res, &error);
if (results == NULL) {
- egg_warning ("failed to get depends: %s", error->message);
+ g_warning ("failed to get depends: %s", error->message);
g_error_free (error);
goto out;
}
@@ -997,7 +995,7 @@ gpk_application_get_depends_cb (PkClient *client, GAsyncResult *res, gpointer us
/* check error code */
error_code = pk_results_get_error_code (results);
if (error_code != NULL) {
- egg_warning ("failed to get depends: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ g_warning ("failed to get depends: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
/* if obvious message, don't tell the user */
if (pk_error_get_code (error_code) != PK_ERROR_ENUM_TRANSACTION_CANCELLED) {
@@ -1014,7 +1012,7 @@ gpk_application_get_depends_cb (PkClient *client, GAsyncResult *res, gpointer us
/* get selection */
ret = gpk_application_get_selected_package (&package_id_selected, NULL);
if (!ret) {
- egg_warning ("no package selected");
+ g_warning ("no package selected");
goto out;
}
@@ -1075,7 +1073,7 @@ gpk_application_menu_depends_cb (GtkAction *_action, gpointer user_data)
/* get selection */
ret = gpk_application_get_selected_package (&package_id_selected, NULL);
if (!ret) {
- egg_warning ("no package selected");
+ g_warning ("no package selected");
goto out;
}
@@ -1104,7 +1102,7 @@ gpk_application_get_full_repo_name (const gchar *data)
/* if no data, we can't look up in the hash table */
if (egg_strzero (data)) {
- egg_warning ("no ident data");
+ g_warning ("no ident data");
/* TRANSLATORS: the repo name is invalid or not found, fall back to this */
return _("Invalid");
}
@@ -1112,7 +1110,7 @@ gpk_application_get_full_repo_name (const gchar *data)
/* try to find in cached repo array */
repo_name = (const gchar *) g_hash_table_lookup (repos, data);
if (repo_name == NULL) {
- egg_warning ("no repo name, falling back to %s", data);
+ g_warning ("no repo name, falling back to %s", data);
return data;
}
return repo_name;
@@ -1138,7 +1136,7 @@ gpk_application_add_detail_item (const gchar *title, const gchar *text, const gc
/* format */
markup = g_strdup_printf ("<b>%s:</b>", title);
- egg_debug ("%s %s %s", markup, text, uri);
+ g_debug ("%s %s %s", markup, text, uri);
gtk_list_store_append (details_store, &iter);
gtk_list_store_set (details_store, &iter,
DETAIL_COLUMN_TITLE, markup,
@@ -1431,7 +1429,7 @@ gpk_application_run_installed (PkResults *results)
/* nothing to show */
if (package_ids_array->len == 0) {
- egg_debug ("nothing to do");
+ g_debug ("nothing to do");
goto out;
}
@@ -1509,7 +1507,7 @@ gpk_application_search_cb (PkClient *client, GAsyncResult *res, gpointer user_da
/* get the results */
results = pk_client_generic_finish (client, res, &error);
if (results == NULL) {
- egg_warning ("failed to search: %s", error->message);
+ g_warning ("failed to search: %s", error->message);
g_error_free (error);
goto out;
}
@@ -1517,7 +1515,7 @@ gpk_application_search_cb (PkClient *client, GAsyncResult *res, gpointer user_da
/* check error code */
error_code = pk_results_get_error_code (results);
if (error_code != NULL) {
- egg_warning ("failed to search: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ g_warning ("failed to search: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
/* if obvious message, don't tell the user */
if (pk_error_get_code (error_code) != PK_ERROR_ENUM_TRANSACTION_CANCELLED) {
@@ -1589,13 +1587,13 @@ gpk_application_perform_search_name_details_file (gpointer user_data)
/* have we got input? */
if (egg_strzero (search_text)) {
- egg_debug ("no input");
+ g_debug ("no input");
goto out;
}
ret = !egg_strzero (search_text);
if (!ret) {
- egg_debug ("invalid input text, will fail");
+ g_debug ("invalid input text, will fail");
/* TODO - make the dialog turn red... */
window = GTK_WINDOW (gtk_builder_get_object (builder, "window_manager"));
gpk_error_dialog_modal (window,
@@ -1605,7 +1603,7 @@ gpk_application_perform_search_name_details_file (gpointer user_data)
_("The search text contains invalid characters"), NULL);
goto out;
}
- egg_debug ("find %s", search_text);
+ g_debug ("find %s", search_text);
/* mark find button insensitive */
search_in_progress = TRUE;
@@ -1635,7 +1633,7 @@ gpk_application_perform_search_name_details_file (gpointer user_data)
(PkProgressCallback) gpk_application_progress_cb, NULL,
(GAsyncReadyCallback) gpk_application_search_cb, NULL);
} else {
- egg_warning ("invalid search type");
+ g_warning ("invalid search type");
goto out;
}
@@ -1745,7 +1743,7 @@ gpk_application_perform_search (gpointer user_data)
} else if (search_mode == GPK_MODE_SELECTED) {
gpk_application_populate_selected (NULL);
} else {
- egg_debug ("doing nothing");
+ g_debug ("doing nothing");
}
}
@@ -1961,7 +1959,7 @@ gpk_application_install_packages_cb (PkTask *_task, GAsyncResult *res, gpointer
/* get the results */
results = pk_task_generic_finish (task, res, &error);
if (results == NULL) {
- egg_warning ("failed to install packages: %s", error->message);
+ g_warning ("failed to install packages: %s", error->message);
g_error_free (error);
goto out;
}
@@ -1969,7 +1967,7 @@ gpk_application_install_packages_cb (PkTask *_task, GAsyncResult *res, gpointer
/* check error code */
error_code = pk_results_get_error_code (results);
if (error_code != NULL) {
- egg_warning ("failed to install packages: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ g_warning ("failed to install packages: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
/* if obvious message, don't tell the user */
if (pk_error_get_code (error_code) != PK_ERROR_ENUM_TRANSACTION_CANCELLED) {
@@ -2013,7 +2011,7 @@ gpk_application_remove_packages_cb (PkTask *_task, GAsyncResult *res, gpointer u
/* get the results */
results = pk_task_generic_finish (task, res, &error);
if (results == NULL) {
- egg_warning ("failed to remove packages: %s", error->message);
+ g_warning ("failed to remove packages: %s", error->message);
g_error_free (error);
goto out;
}
@@ -2021,7 +2019,7 @@ gpk_application_remove_packages_cb (PkTask *_task, GAsyncResult *res, gpointer u
/* check error code */
error_code = pk_results_get_error_code (results);
if (error_code != NULL) {
- egg_warning ("failed to remove packages: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ g_warning ("failed to remove packages: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
/* if obvious message, don't tell the user */
if (pk_error_get_code (error_code) != PK_ERROR_ENUM_TRANSACTION_CANCELLED) {
@@ -2180,7 +2178,7 @@ gpk_application_groups_treeview_changed_cb (GtkTreeSelection *selection, gpointe
gtk_tree_model_get (model, &iter,
GROUPS_COLUMN_ID, &search_group,
GROUPS_COLUMN_ACTIVE, &active, -1);
- egg_debug ("selected row is: %s (%i)", search_group, active);
+ g_debug ("selected row is: %s (%i)", search_group, active);
/* don't search parent groups */
if (!active) {
@@ -2234,7 +2232,7 @@ gpk_application_get_details_cb (PkClient *client, GAsyncResult *res, gpointer us
/* get the results */
results = pk_client_generic_finish (client, res, &error);
if (results == NULL) {
- egg_warning ("failed to get list of categories: %s", error->message);
+ g_warning ("failed to get list of categories: %s", error->message);
g_error_free (error);
goto out;
}
@@ -2242,7 +2240,7 @@ gpk_application_get_details_cb (PkClient *client, GAsyncResult *res, gpointer us
/* check error code */
error_code = pk_results_get_error_code (results);
if (error_code != NULL) {
- egg_warning ("failed to get details: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ g_warning ("failed to get details: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
/* if obvious message, don't tell the user */
if (pk_error_get_code (error_code) != PK_ERROR_ENUM_TRANSACTION_CANCELLED) {
@@ -2256,7 +2254,7 @@ gpk_application_get_details_cb (PkClient *client, GAsyncResult *res, gpointer us
/* get data */
array = pk_results_get_details_array (results);
if (array->len != 1) {
- egg_warning ("not one entry %i", array->len);
+ g_warning ("not one entry %i", array->len);
goto out;
}
@@ -2394,7 +2392,7 @@ gpk_application_packages_treeview_clicked_cb (GtkTreeSelection *selection, gpoin
/* This will only work in single or browse selection mode! */
if (!gtk_tree_selection_get_selected (selection, &model, &iter)) {
- egg_debug ("no row selected");
+ g_debug ("no row selected");
/* we cannot now add it */
gpk_application_allow_install (FALSE);
@@ -2413,7 +2411,7 @@ gpk_application_packages_treeview_clicked_cb (GtkTreeSelection *selection, gpoin
PACKAGES_COLUMN_ID, &package_id,
-1);
if (package_id == NULL) {
- egg_debug ("ignoring help click");
+ g_debug ("ignoring help click");
goto out;
}
@@ -2468,7 +2466,7 @@ gpk_application_notify_network_state_cb (PkControl *_control, GParamSpec *pspec,
g_object_get (control,
"network-state", &state,
NULL);
- egg_debug ("state=%i", state);
+ g_debug ("state=%i", state);
}
/**
@@ -2548,7 +2546,7 @@ gpk_application_menu_search_by_name (GtkMenuItem *item, gpointer data)
/* change type */
search_type = GPK_SEARCH_NAME;
- egg_debug ("set search type=%i", search_type);
+ g_debug ("set search type=%i", search_type);
/* save default to GSettings */
g_settings_set_enum (settings,
@@ -2572,7 +2570,7 @@ gpk_application_menu_search_by_description (GtkMenuItem *item, gpointer data)
/* set type */
search_type = GPK_SEARCH_DETAILS;
- egg_debug ("set search type=%i", search_type);
+ g_debug ("set search type=%i", search_type);
/* save default to GSettings */
g_settings_set_enum (settings,
@@ -2596,7 +2594,7 @@ gpk_application_menu_search_by_file (GtkMenuItem *item, gpointer data)
/* set type */
search_type = GPK_SEARCH_FILE;
- egg_debug ("set search type=%i", search_type);
+ g_debug ("set search type=%i", search_type);
/* save default to GSettings */
g_settings_set_enum (settings,
@@ -2624,7 +2622,7 @@ gpk_application_entry_text_icon_press_cb (GtkEntry *entry, GtkEntryIconPosition
if (event->button != 1)
return;
- egg_debug ("icon_pos=%i", icon_pos);
+ g_debug ("icon_pos=%i", icon_pos);
if (pk_bitfield_contain (roles, PK_ROLE_ENUM_SEARCH_NAME)) {
/* TRANSLATORS: context menu item for the search type icon */
@@ -2755,10 +2753,10 @@ gpk_application_menu_sources_cb (GtkAction *_action, gpointer user_data)
xid = gdk_x11_drawable_get_xid (gtk_widget_get_window (window));
command = g_strdup_printf ("%s/gnome-control-center update --parent-window %u", BINDIR, xid);
- egg_debug ("running: %s", command);
+ g_debug ("running: %s", command);
ret = g_spawn_command_line_async (command, NULL);
if (!ret) {
- egg_warning ("spawn of %s failed", command);
+ g_warning ("spawn of %s failed", command);
}
g_free (command);
}
@@ -2779,10 +2777,10 @@ gpk_application_menu_log_cb (GtkAction *_action, gpointer user_data)
xid = gdk_x11_drawable_get_xid (gtk_widget_get_window (window));
command = g_strdup_printf ("%s/gpk-log --parent-window %u", BINDIR, xid);
- egg_debug ("running: %s", command);
+ g_debug ("running: %s", command);
ret = g_spawn_command_line_async (command, NULL);
if (!ret) {
- egg_warning ("spawn of %s failed", command);
+ g_warning ("spawn of %s failed", command);
}
g_free (command);
}
@@ -2801,7 +2799,7 @@ gpk_application_refresh_cache_cb (PkClient *client, GAsyncResult *res, gpointer
/* get the results */
results = pk_client_generic_finish (client, res, &error);
if (results == NULL) {
- egg_warning ("failed to refresh: %s", error->message);
+ g_warning ("failed to refresh: %s", error->message);
g_error_free (error);
goto out;
}
@@ -2809,7 +2807,7 @@ gpk_application_refresh_cache_cb (PkClient *client, GAsyncResult *res, gpointer
/* check error code */
error_code = pk_results_get_error_code (results);
if (error_code != NULL) {
- egg_warning ("failed to refresh: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ g_warning ("failed to refresh: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
/* if obvious message, don't tell the user */
if (pk_error_get_code (error_code) != PK_ERROR_ENUM_TRANSACTION_CANCELLED) {
@@ -3084,7 +3082,7 @@ gpk_application_package_row_activated_cb (GtkTreeView *treeview, GtkTreePath *pa
model = gtk_tree_view_get_model (treeview);
ret = gtk_tree_model_get_iter (model, &iter, path);
if (!ret) {
- egg_warning ("failed to get selection");
+ g_warning ("failed to get selection");
return;
}
@@ -3096,7 +3094,7 @@ gpk_application_package_row_activated_cb (GtkTreeView *treeview, GtkTreePath *pa
/* check we aren't a help line */
if (package_id == NULL) {
- egg_debug ("ignoring help click");
+ g_debug ("ignoring help click");
goto out;
}
@@ -3128,7 +3126,7 @@ gpk_application_group_row_separator_func (GtkTreeModel *model, GtkTreeIter *iter
static void
gpk_application_treeview_renderer_clicked (GtkCellRendererToggle *cell, gchar *uri, gpointer user_data)
{
- egg_debug ("clicked %s", uri);
+ g_debug ("clicked %s", uri);
gpk_gnome_open (uri);
}
@@ -3250,7 +3248,7 @@ gpk_application_get_categories_cb (PkClient *client, GAsyncResult *res, gpointer
/* get the results */
results = pk_client_generic_finish (client, res, &error);
if (results == NULL) {
- egg_warning ("failed to get list of categories: %s", error->message);
+ g_warning ("failed to get list of categories: %s", error->message);
g_error_free (error);
goto out;
}
@@ -3258,7 +3256,7 @@ gpk_application_get_categories_cb (PkClient *client, GAsyncResult *res, gpointer
/* check error code */
error_code = pk_results_get_error_code (results);
if (error_code != NULL) {
- egg_warning ("failed to get cats: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ g_warning ("failed to get cats: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
/* if obvious message, don't tell the user */
if (pk_error_get_code (error_code) != PK_ERROR_ENUM_TRANSACTION_CANCELLED) {
@@ -3570,7 +3568,7 @@ pk_backend_status_get_properties_cb (GObject *object, GAsyncResult *res, gpointe
if (pk_bitfield_contain (roles, PK_ROLE_ENUM_SEARCH_DETAILS)) {
gpk_application_menu_search_by_description (NULL, NULL);
} else {
- egg_warning ("cannont use mode %i as not capable, using name", search_type);
+ g_warning ("cannont use mode %i as not capable, using name", search_type);
gpk_application_menu_search_by_name (NULL, NULL);
}
@@ -3581,13 +3579,13 @@ pk_backend_status_get_properties_cb (GObject *object, GAsyncResult *res, gpointe
if (pk_bitfield_contain (roles, PK_ROLE_ENUM_SEARCH_FILE)) {
gpk_application_menu_search_by_file (NULL, NULL);
} else {
- egg_warning ("cannont use mode %i as not capable, using name", search_type);
+ g_warning ("cannont use mode %i as not capable, using name", search_type);
gpk_application_menu_search_by_name (NULL, NULL);
}
/* mode not recognised */
} else {
- egg_warning ("cannot recognise mode %i, using name", search_type);
+ g_warning ("cannot recognise mode %i, using name", search_type);
gpk_application_menu_search_by_name (NULL, NULL);
}
out:
@@ -3613,7 +3611,7 @@ gpk_application_get_repo_list_cb (PkClient *client, GAsyncResult *res, gpointer
/* get the results */
results = pk_client_generic_finish (client, res, &error);
if (results == NULL) {
- egg_warning ("failed to get list of repos: %s", error->message);
+ g_warning ("failed to get list of repos: %s", error->message);
g_error_free (error);
goto out;
}
@@ -3621,7 +3619,7 @@ gpk_application_get_repo_list_cb (PkClient *client, GAsyncResult *res, gpointer
/* check error code */
error_code = pk_results_get_error_code (results);
if (error_code != NULL) {
- egg_warning ("failed to repo list: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ g_warning ("failed to repo list: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
/* if obvious message, don't tell the user */
if (pk_error_get_code (error_code) != PK_ERROR_ENUM_TRANSACTION_CANCELLED) {
@@ -3641,7 +3639,7 @@ gpk_application_get_repo_list_cb (PkClient *client, GAsyncResult *res, gpointer
"description", &description,
NULL);
- egg_debug ("repo = %s:%s", repo_id, description);
+ g_debug ("repo = %s:%s", repo_id, description);
/* no problem, just no point adding as we will fallback to the repo_id */
if (description != NULL)
g_hash_table_insert (repos, g_strdup (repo_id), g_strdup (description));
@@ -3739,13 +3737,13 @@ gpk_application_startup_cb (GtkApplication *application, gpointer user_data)
desktop = pk_desktop_new ();
ret = pk_desktop_open_database (desktop, NULL);
if (!ret)
- egg_warning ("Failure opening database");
+ g_warning ("Failure opening database");
/* get UI */
builder = gtk_builder_new ();
retval = gtk_builder_add_from_file (builder, GPK_DATA "/gpk-application.ui", &error);
if (retval == 0) {
- egg_warning ("failed to load ui: %s", error->message);
+ g_warning ("failed to load ui: %s", error->message);
g_error_free (error);
goto out;
}
@@ -4082,11 +4080,14 @@ main (int argc, char *argv[])
context = g_option_context_new (NULL);
g_option_context_set_summary (context, _("Add/Remove Software"));
g_option_context_add_main_entries (context, options, NULL);
- g_option_context_add_group (context, egg_debug_get_option_group ());
+ g_option_context_add_group (context, gpk_debug_get_option_group ());
g_option_context_add_group (context, gtk_get_option_group (TRUE));
g_option_context_parse (context, &argc, &argv, NULL);
g_option_context_free (context);
+ /* add PackageKit */
+ gpk_debug_add_log_domain ("PackageKit");
+
if (program_version) {
g_print (VERSION "\n");
return 0;
diff --git a/src/gpk-auto-refresh.c b/src/gpk-auto-refresh.c
index 41efed7..6b85ea2 100644
--- a/src/gpk-auto-refresh.c
+++ b/src/gpk-auto-refresh.c
@@ -36,7 +36,6 @@
#include <packagekit-glib2/packagekit.h>
#include <libupower-glib/upower.h>
-#include "egg-debug.h"
#include "egg-string.h"
#include "gpk-common.h"
@@ -118,7 +117,7 @@ gpk_auto_refresh_signal_refresh_cache (GpkAutoRefresh *arefresh)
{
g_return_val_if_fail (GPK_IS_AUTO_REFRESH (arefresh), FALSE);
- egg_debug ("emitting refresh-cache");
+ g_debug ("emitting refresh-cache");
g_signal_emit (arefresh, signals [REFRESH_CACHE], 0);
return TRUE;
}
@@ -131,7 +130,7 @@ gpk_auto_refresh_signal_get_updates (GpkAutoRefresh *arefresh)
{
g_return_val_if_fail (GPK_IS_AUTO_REFRESH (arefresh), FALSE);
- egg_debug ("emitting get-updates");
+ g_debug ("emitting get-updates");
g_signal_emit (arefresh, signals [GET_UPDATES], 0);
return TRUE;
}
@@ -144,7 +143,7 @@ gpk_auto_refresh_signal_get_upgrades (GpkAutoRefresh *arefresh)
{
g_return_val_if_fail (GPK_IS_AUTO_REFRESH (arefresh), FALSE);
- egg_debug ("emitting get-upgrades");
+ g_debug ("emitting get-upgrades");
g_signal_emit (arefresh, signals [GET_UPGRADES], 0);
return TRUE;
}
@@ -163,7 +162,7 @@ gpk_auto_refresh_get_time_refresh_cache_cb (GObject *object, GAsyncResult *res,
/* get the result */
seconds = pk_control_get_time_since_action_finish (control, res, &error);
if (seconds == 0) {
- egg_warning ("failed to get time: %s", error->message);
+ g_warning ("failed to get time: %s", error->message);
g_error_free (error);
return;
}
@@ -171,7 +170,7 @@ gpk_auto_refresh_get_time_refresh_cache_cb (GObject *object, GAsyncResult *res,
/* have we passed the timout? */
thresh = g_settings_get_int (arefresh->priv->settings, GPK_SETTINGS_FREQUENCY_GET_UPDATES);
if (seconds < thresh) {
- egg_debug ("not before timeout, thresh=%u, now=%u", thresh, seconds);
+ g_debug ("not before timeout, thresh=%u, now=%u", thresh, seconds);
return;
}
@@ -192,26 +191,26 @@ gpk_auto_refresh_maybe_refresh_cache (GpkAutoRefresh *arefresh)
/* if we don't want to auto check for updates, don't do this either */
thresh = g_settings_get_int (arefresh->priv->settings, GPK_SETTINGS_FREQUENCY_GET_UPDATES);
if (thresh == 0) {
- egg_debug ("not when policy is set to never");
+ g_debug ("not when policy is set to never");
return;
}
/* not on battery */
if (arefresh->priv->on_battery) {
- egg_debug ("not when on battery");
+ g_debug ("not when on battery");
return;
}
/* only do the refresh cache when the user is idle */
if (!arefresh->priv->session_idle) {
- egg_debug ("not when session active");
+ g_debug ("not when session active");
return;
}
/* get this each time, as it may have changed behind out back */
thresh = g_settings_get_int (arefresh->priv->settings, GPK_SETTINGS_FREQUENCY_REFRESH_CACHE);
if (thresh == 0) {
- egg_debug ("not when policy is set to never");
+ g_debug ("not when policy is set to never");
return;
}
@@ -234,7 +233,7 @@ gpk_auto_refresh_get_time_get_updates_cb (GObject *object, GAsyncResult *res, Gp
/* get the result */
seconds = pk_control_get_time_since_action_finish (control, res, &error);
if (seconds == 0) {
- egg_warning ("failed to get time: %s", error->message);
+ g_warning ("failed to get time: %s", error->message);
g_error_free (error);
return;
}
@@ -242,7 +241,7 @@ gpk_auto_refresh_get_time_get_updates_cb (GObject *object, GAsyncResult *res, Gp
/* have we passed the timout? */
thresh = g_settings_get_int (arefresh->priv->settings, GPK_SETTINGS_FREQUENCY_GET_UPDATES);
if (seconds < thresh) {
- egg_debug ("not before timeout, thresh=%u, now=%u", thresh, seconds);
+ g_debug ("not before timeout, thresh=%u, now=%u", thresh, seconds);
return;
}
@@ -263,7 +262,7 @@ gpk_auto_refresh_maybe_get_updates (GpkAutoRefresh *arefresh)
if (!arefresh->priv->force_get_updates_login) {
arefresh->priv->force_get_updates_login = TRUE;
if (g_settings_get_boolean (arefresh->priv->settings, GPK_SETTINGS_FORCE_GET_UPDATES_LOGIN)) {
- egg_debug ("forcing get update due to GSettings");
+ g_debug ("forcing get update due to GSettings");
gpk_auto_refresh_signal_get_updates (arefresh);
return;
}
@@ -272,7 +271,7 @@ gpk_auto_refresh_maybe_get_updates (GpkAutoRefresh *arefresh)
/* if we don't want to auto check for updates, don't do this either */
thresh = g_settings_get_int (arefresh->priv->settings, GPK_SETTINGS_FREQUENCY_GET_UPDATES);
if (thresh == 0) {
- egg_debug ("not when policy is set to never");
+ g_debug ("not when policy is set to never");
return;
}
@@ -295,7 +294,7 @@ gpk_auto_refresh_get_time_get_upgrades_cb (GObject *object, GAsyncResult *res, G
/* get the result */
seconds = pk_control_get_time_since_action_finish (control, res, &error);
if (seconds == 0) {
- egg_warning ("failed to get time: %s", error->message);
+ g_warning ("failed to get time: %s", error->message);
g_error_free (error);
return;
}
@@ -303,7 +302,7 @@ gpk_auto_refresh_get_time_get_upgrades_cb (GObject *object, GAsyncResult *res, G
/* have we passed the timout? */
thresh = g_settings_get_int (arefresh->priv->settings, GPK_SETTINGS_FREQUENCY_GET_UPDATES);
if (seconds < thresh) {
- egg_debug ("not before timeout, thresh=%u, now=%u", thresh, seconds);
+ g_debug ("not before timeout, thresh=%u, now=%u", thresh, seconds);
return;
}
@@ -324,7 +323,7 @@ gpk_auto_refresh_maybe_get_upgrades (GpkAutoRefresh *arefresh)
/* get this each time, as it may have changed behind out back */
thresh = g_settings_get_int (arefresh->priv->settings, GPK_SETTINGS_FREQUENCY_GET_UPGRADES);
if (thresh == 0) {
- egg_debug ("not when policy is set to never");
+ g_debug ("not when policy is set to never");
return;
}
@@ -370,7 +369,7 @@ gpk_auto_refresh_change_state (GpkAutoRefresh *arefresh)
/* no point continuing if we have no network */
if (!arefresh->priv->network_active) {
- egg_debug ("not when no network");
+ g_debug ("not when no network");
return FALSE;
}
@@ -396,7 +395,7 @@ gpk_auto_refresh_change_state (GpkAutoRefresh *arefresh)
if (arefresh->priv->timeout_id != 0)
g_source_remove (arefresh->priv->timeout_id);
value = g_settings_get_int (arefresh->priv->settings, GPK_SETTINGS_SESSION_STARTUP_TIMEOUT);
- egg_debug ("defering action for %i seconds", value);
+ g_debug ("defering action for %i seconds", value);
arefresh->priv->timeout_id =
g_timeout_add_seconds (value, (GSourceFunc) gpk_auto_refresh_change_state_cb, arefresh);
g_source_set_name_by_id (arefresh->priv->timeout_id, "[GpkAutoRefresh] change-state");
@@ -429,7 +428,7 @@ gpk_auto_refresh_session_idle_changed_cb (GpkSession *session, gboolean is_idle,
{
g_return_if_fail (GPK_IS_AUTO_REFRESH (arefresh));
- egg_debug ("setting is_idle %i", is_idle);
+ g_debug ("setting is_idle %i", is_idle);
arefresh->priv->session_idle = is_idle;
if (arefresh->priv->session_idle)
gpk_auto_refresh_change_state (arefresh);
@@ -469,7 +468,7 @@ gpk_auto_refresh_convert_network_state (GpkAutoRefresh *arefresh, PkNetworkEnum
return g_settings_get_boolean (arefresh->priv->settings, GPK_SETTINGS_CONNECTION_USE_WIFI);
/* not recognised */
- egg_warning ("state unknown: %i", state);
+ g_warning ("state unknown: %i", state);
return TRUE;
}
@@ -485,7 +484,7 @@ gpk_auto_refresh_notify_network_state_cb (PkControl *control, GParamSpec *pspec,
g_object_get (control, "network-state", &state, NULL);
arefresh->priv->network_active = gpk_auto_refresh_convert_network_state (arefresh, state);
- egg_debug ("setting online %i", arefresh->priv->network_active);
+ g_debug ("setting online %i", arefresh->priv->network_active);
if (arefresh->priv->network_active)
gpk_auto_refresh_change_state (arefresh);
}
@@ -501,7 +500,7 @@ gpk_auto_refresh_timeout_cb (gpointer user_data)
g_return_val_if_fail (GPK_IS_AUTO_REFRESH (arefresh), FALSE);
/* debug so we can catch polling */
- egg_debug ("polling check");
+ g_debug ("polling check");
/* triggered once an hour */
gpk_auto_refresh_change_state (arefresh);
@@ -523,12 +522,12 @@ gpk_auto_refresh_client_changed_cb (UpClient *client, GpkAutoRefresh *arefresh)
/* get the on-battery state */
on_battery = up_client_get_on_battery (arefresh->priv->client);
if (on_battery == arefresh->priv->on_battery) {
- egg_debug ("same state as before, ignoring");
+ g_debug ("same state as before, ignoring");
return;
}
/* save in local cache */
- egg_debug ("setting on_battery %i", on_battery);
+ g_debug ("setting on_battery %i", on_battery);
arefresh->priv->on_battery = on_battery;
if (!on_battery)
gpk_auto_refresh_change_state (arefresh);
@@ -549,7 +548,7 @@ gpk_auto_refresh_get_properties_cb (GObject *object, GAsyncResult *res, GpkAutoR
ret = pk_control_get_properties_finish (control, res, &error);
if (!ret) {
/* TRANSLATORS: backend is broken, and won't tell us what it supports */
- egg_warning ("could not get properties");
+ g_warning ("could not get properties");
g_error_free (error);
goto out;
}
@@ -597,7 +596,7 @@ gpk_auto_refresh_init (GpkAutoRefresh *arefresh)
/* get the battery state */
arefresh->priv->on_battery = up_client_get_on_battery (arefresh->priv->client);
- egg_debug ("setting on battery %i", arefresh->priv->on_battery);
+ g_debug ("setting on battery %i", arefresh->priv->on_battery);
/* use gnome-session for the idle detection */
arefresh->priv->session = gpk_session_new ();
diff --git a/src/gpk-cell-renderer-info.c b/src/gpk-cell-renderer-info.c
index fc69f11..08e55ac 100644
--- a/src/gpk-cell-renderer-info.c
+++ b/src/gpk-cell-renderer-info.c
@@ -26,8 +26,6 @@
#include <gtk/gtk.h>
#include <packagekit-glib2/packagekit.h>
-#include "egg-debug.h"
-
#include "gpk-enum.h"
#include "gpk-cell-renderer-info.h"
diff --git a/src/gpk-cell-renderer-restart.c b/src/gpk-cell-renderer-restart.c
index 6459333..9da9cfd 100644
--- a/src/gpk-cell-renderer-restart.c
+++ b/src/gpk-cell-renderer-restart.c
@@ -26,8 +26,6 @@
#include <gtk/gtk.h>
#include <packagekit-glib2/packagekit.h>
-#include "egg-debug.h"
-
#include "gpk-enum.h"
#include "gpk-cell-renderer-restart.h"
diff --git a/src/gpk-cell-renderer-size.c b/src/gpk-cell-renderer-size.c
index c6e9ed0..92fafdf 100644
--- a/src/gpk-cell-renderer-size.c
+++ b/src/gpk-cell-renderer-size.c
@@ -24,7 +24,6 @@
#include <glib.h>
#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include "egg-debug.h"
#include "gpk-cell-renderer-size.h"
diff --git a/src/gpk-cell-renderer-uri.c b/src/gpk-cell-renderer-uri.c
index 3913ca7..f63c520 100644
--- a/src/gpk-cell-renderer-uri.c
+++ b/src/gpk-cell-renderer-uri.c
@@ -24,7 +24,6 @@
#include <glib.h>
#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include "egg-debug.h"
#include "gpk-cell-renderer-uri.h"
@@ -79,7 +78,7 @@ gpk_cell_renderer_uri_activate (GtkCellRenderer *cell, GdkEvent *event,
gpk_cell_renderer_uri_set_clicked (cru, TRUE);
- egg_debug ("emit: %s", cru->uri);
+ g_debug ("emit: %s", cru->uri);
g_signal_emit (cell, signals [CLICKED], 0, cru->uri);
return TRUE;
}
@@ -157,7 +156,7 @@ gpk_cell_renderer_uri_set_link_color (GdkColor *color, gboolean visited)
return;
}
}
- egg_debug ("cannot get color for %i,%i,%i", color->red, color->blue, color->green);
+ g_debug ("cannot get color for %i,%i,%i", color->red, color->blue, color->green);
}
static void
diff --git a/src/gpk-check-update.c b/src/gpk-check-update.c
index 54d7f1d..a82bcd3 100644
--- a/src/gpk-check-update.c
+++ b/src/gpk-check-update.c
@@ -40,7 +40,6 @@
#include <canberra-gtk.h>
#include <gio/gio.h>
-#include "egg-debug.h"
#include "egg-string.h"
#include "egg-dbus-monitor.h"
@@ -101,21 +100,21 @@ gpk_check_update_set_icon_visibility (GpkCheckUpdate *cupdate)
/* check we have data */
if (cupdate->priv->gicon == NULL) {
- egg_debug ("not showing icon as nothing to show");
+ g_debug ("not showing icon as nothing to show");
goto out;
}
/* check we have no inhibits */
if (cupdate->priv->icon_inhibit_update_in_progress) {
- egg_debug ("not showing icon as update in progress");
+ g_debug ("not showing icon as update in progress");
goto out;
}
if (cupdate->priv->icon_inhibit_network_offline) {
- egg_debug ("not showing icon as network offline");
+ g_debug ("not showing icon as network offline");
goto out;
}
if (cupdate->priv->icon_inhibit_update_viewer_connected) {
- egg_debug ("not showing icon as update viewer showing");
+ g_debug ("not showing icon as update viewer showing");
goto out;
}
@@ -179,7 +178,7 @@ gpk_check_update_show_preferences_cb (GtkMenuItem *item, GpkCheckUpdate *cupdate
{
const gchar *command = "gpk-prefs";
if (!g_spawn_command_line_async (command, NULL))
- egg_warning ("Couldn't execute command: %s", command);
+ g_warning ("Couldn't execute command: %s", command);
}
/**
@@ -249,7 +248,7 @@ gpk_check_update_popup_menu_cb (GtkStatusIcon *status_icon, guint button, guint3
GtkWidget *item;
GtkWidget *image;
- egg_debug ("icon right clicked");
+ g_debug ("icon right clicked");
/* TRANSLATORS: context menu to open the preferences */
item = gtk_image_menu_item_new_with_mnemonic (_("_Preferences"));
@@ -299,13 +298,12 @@ gpk_check_update_get_updates_post_update_cb (GpkCheckUpdate *cupdate)
g_return_val_if_fail (GPK_IS_CHECK_UPDATE (cupdate), FALSE);
/* debug so we can catch polling */
- egg_debug ("post updates check");
+ g_debug ("post updates check");
gpk_check_update_query_updates (cupdate);
return FALSE;
}
-
/**
* gpk_check_update_finished_notify:
**/
@@ -327,12 +325,11 @@ gpk_check_update_finished_notify (GpkCheckUpdate *cupdate, PkResults *results)
gchar *package_id = NULL;
gchar *summary = NULL;
-
/* check we got some packages */
array = pk_results_get_package_array (results);
- egg_debug ("length=%i", array->len);
+ g_debug ("length=%i", array->len);
if (array->len == 0) {
- egg_debug ("no updates");
+ g_debug ("no updates");
goto out;
}
@@ -348,7 +345,7 @@ gpk_check_update_finished_notify (GpkCheckUpdate *cupdate, PkResults *results)
NULL);
split = pk_package_id_split (package_id);
- egg_debug ("%s, %s, %s", pk_info_enum_to_text (info),
+ g_debug ("%s, %s, %s", pk_info_enum_to_text (info),
split[PK_PACKAGE_ID_NAME], summary);
if (info == PK_INFO_ENUM_BLOCKED) {
skipped_number++;
@@ -389,7 +386,7 @@ gpk_check_update_finished_notify (GpkCheckUpdate *cupdate, PkResults *results)
/* do we do the notification? */
ret = g_settings_get_boolean (cupdate->priv->settings, GPK_SETTINGS_NOTIFY_UPDATE_COMPLETE);
if (!ret) {
- egg_debug ("ignoring due to GSettings");
+ g_debug ("ignoring due to GSettings");
goto out;
}
@@ -409,7 +406,7 @@ gpk_check_update_finished_notify (GpkCheckUpdate *cupdate, PkResults *results)
}
ret = notify_notification_show (notification, &error);
if (!ret) {
- egg_warning ("error: %s", error->message);
+ g_warning ("error: %s", error->message);
g_error_free (error);
}
out:
@@ -457,10 +454,10 @@ gpk_check_update_show_error (GpkCheckUpdate *cupdate, PkError *error_code)
cupdate->priv->error_code = g_object_ref (error_code);
/* do the bubble */
- egg_debug ("title=%s, message=%s", title, message);
+ g_debug ("title=%s, message=%s", title, message);
notification = notify_notification_new (title, message, NULL);
if (notification == NULL) {
- egg_warning ("failed to get bubble");
+ g_warning ("failed to get bubble");
goto out;
}
notify_notification_set_timeout (notification, 15000);
@@ -470,7 +467,7 @@ gpk_check_update_show_error (GpkCheckUpdate *cupdate, PkError *error_code)
_("Show details"), gpk_check_update_libnotify_cb, cupdate, NULL);
ret = notify_notification_show (notification, &error);
if (!ret) {
- egg_warning ("error: %s", error->message);
+ g_warning ("error: %s", error->message);
g_error_free (error);
}
/* track so we can prevent doubled notifications */
@@ -495,7 +492,7 @@ gpk_check_update_update_system_finished_cb (PkTask *task, GAsyncResult *res, Gpk
/* get the results */
results = pk_task_generic_finish (task, res, &error);
if (results == NULL) {
- egg_warning ("failed to update system: %s", error->message);
+ g_warning ("failed to update system: %s", error->message);
g_error_free (error);
/* we failed, so re-get the update list */
@@ -509,7 +506,7 @@ gpk_check_update_update_system_finished_cb (PkTask *task, GAsyncResult *res, Gpk
/* check error code */
error_code = pk_results_get_error_code (results);
if (error_code != NULL) {
- egg_warning ("failed to update system: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ g_warning ("failed to update system: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
gpk_check_update_show_error (cupdate, error_code);
goto out;
}
@@ -547,7 +544,7 @@ gpk_check_update_activate_update_cb (GtkStatusIcon *status_icon, GpkCheckUpdate
ret = g_spawn_command_line_async (command, &error);
if (!ret) {
- egg_warning ("Couldn't execute %s: %s", command, error->message);
+ g_warning ("Couldn't execute %s: %s", command, error->message);
g_error_free (error);
}
}
@@ -567,22 +564,22 @@ gpk_check_update_libnotify_cb (NotifyNotification *notification, gchar *action,
GpkCheckUpdate *cupdate = GPK_CHECK_UPDATE (data);
if (g_strcmp0 (action, "do-not-show-complete-restart") == 0) {
- egg_debug ("set %s to FALSE", GPK_SETTINGS_NOTIFY_UPDATE_COMPLETE_RESTART);
+ g_debug ("set %s to FALSE", GPK_SETTINGS_NOTIFY_UPDATE_COMPLETE_RESTART);
g_settings_set_boolean (cupdate->priv->settings, GPK_SETTINGS_NOTIFY_UPDATE_COMPLETE_RESTART, FALSE);
} else if (g_strcmp0 (action, "do-not-show-complete") == 0) {
- egg_debug ("set %s to FALSE", GPK_SETTINGS_NOTIFY_UPDATE_COMPLETE);
+ g_debug ("set %s to FALSE", GPK_SETTINGS_NOTIFY_UPDATE_COMPLETE);
g_settings_set_boolean (cupdate->priv->settings, GPK_SETTINGS_NOTIFY_UPDATE_COMPLETE, FALSE);
} else if (g_strcmp0 (action, "do-not-show-update-started") == 0) {
- egg_debug ("set %s to FALSE", GPK_SETTINGS_NOTIFY_UPDATE_STARTED);
+ g_debug ("set %s to FALSE", GPK_SETTINGS_NOTIFY_UPDATE_STARTED);
g_settings_set_boolean (cupdate->priv->settings, GPK_SETTINGS_NOTIFY_UPDATE_STARTED, FALSE);
} else if (g_strcmp0 (action, "do-not-show-notify-critical") == 0) {
- egg_debug ("set %s to FALSE", GPK_SETTINGS_NOTIFY_CRITICAL);
+ g_debug ("set %s to FALSE", GPK_SETTINGS_NOTIFY_CRITICAL);
g_settings_set_boolean (cupdate->priv->settings, GPK_SETTINGS_NOTIFY_CRITICAL, FALSE);
} else if (g_strcmp0 (action, "do-not-show-update-not-battery") == 0) {
- egg_debug ("set %s to FALSE", GPK_SETTINGS_NOTIFY_UPDATE_NOT_BATTERY);
+ g_debug ("set %s to FALSE", GPK_SETTINGS_NOTIFY_UPDATE_NOT_BATTERY);
g_settings_set_boolean (cupdate->priv->settings, GPK_SETTINGS_NOTIFY_UPDATE_NOT_BATTERY, FALSE);
} else if (g_strcmp0 (action, "distro-upgrade-do-not-show-available") == 0) {
- egg_debug ("set %s to FALSE", GPK_SETTINGS_NOTIFY_DISTRO_UPGRADES);
+ g_debug ("set %s to FALSE", GPK_SETTINGS_NOTIFY_DISTRO_UPGRADES);
g_settings_set_boolean (cupdate->priv->settings, GPK_SETTINGS_NOTIFY_DISTRO_UPGRADES, FALSE);
} else if (g_strcmp0 (action, "show-error-details") == 0) {
title = gpk_error_enum_to_localised_text (pk_error_get_code (cupdate->priv->error_code));
@@ -598,17 +595,17 @@ gpk_check_update_libnotify_cb (NotifyNotification *notification, gchar *action,
} else if (g_strcmp0 (action, "show-update-viewer") == 0) {
ret = g_spawn_command_line_async (BINDIR "/gpk-update-viewer", &error);
if (!ret) {
- egg_warning ("Failure launching update viewer: %s", error->message);
+ g_warning ("Failure launching update viewer: %s", error->message);
g_error_free (error);
}
} else if (g_strcmp0 (action, "distro-upgrade-info") == 0) {
ret = g_spawn_command_line_async (DATADIR "/PackageKit/pk-upgrade-distro.sh", &error);
if (!ret) {
- egg_warning ("Failure launching pk-upgrade-distro.sh: %s", error->message);
+ g_warning ("Failure launching pk-upgrade-distro.sh: %s", error->message);
g_error_free (error);
}
} else {
- egg_warning ("unknown action id: %s", action);
+ g_warning ("unknown action id: %s", action);
}
return;
}
@@ -630,14 +627,14 @@ gpk_check_update_critical_updates_warning (GpkCheckUpdate *cupdate, GPtrArray *a
/* do we do the notification? */
ret = g_settings_get_boolean (cupdate->priv->settings, GPK_SETTINGS_NOTIFY_CRITICAL);
if (!ret) {
- egg_debug ("ignoring due to GSettings");
+ g_debug ("ignoring due to GSettings");
return;
}
/* if the number of critical updates is the same as the last notification,
* then skip the notifcation as we don't want to bombard the user every hour */
if (array->len == cupdate->priv->number_updates_critical_last_shown) {
- egg_debug ("ignoring as user ignored last warning");
+ g_debug ("ignoring as user ignored last warning");
return;
}
@@ -658,10 +655,10 @@ gpk_check_update_critical_updates_warning (GpkCheckUpdate *cupdate, GPtrArray *a
}
/* do the bubble */
- egg_debug ("title=%s, message=%s", title, message);
+ g_debug ("title=%s, message=%s", title, message);
notification = notify_notification_new (title, message, NULL);
if (notification == NULL) {
- egg_warning ("failed to get bubble");
+ g_warning ("failed to get bubble");
return;
}
notify_notification_set_timeout (notification, 15000);
@@ -671,7 +668,7 @@ gpk_check_update_critical_updates_warning (GpkCheckUpdate *cupdate, GPtrArray *a
_("Install updates"), gpk_check_update_libnotify_cb, cupdate, NULL);
ret = notify_notification_show (notification, &error);
if (!ret) {
- egg_warning ("error: %s", error->message);
+ g_warning ("error: %s", error->message);
g_error_free (error);
}
/* track so we can prevent doubled notifications */
@@ -731,20 +728,20 @@ gpk_check_update_check_on_battery (GpkCheckUpdate *cupdate)
ret = g_settings_get_boolean (cupdate->priv->settings, GPK_SETTINGS_UPDATE_BATTERY);
if (ret) {
- egg_debug ("okay to update due to policy");
+ g_debug ("okay to update due to policy");
return TRUE;
}
ret = gpk_auto_refresh_get_on_battery (cupdate->priv->arefresh);
if (!ret) {
- egg_debug ("okay to update as on AC");
+ g_debug ("okay to update as on AC");
return TRUE;
}
/* do we do the notification? */
ret = g_settings_get_boolean (cupdate->priv->settings, GPK_SETTINGS_NOTIFY_UPDATE_NOT_BATTERY);
if (!ret) {
- egg_debug ("ignoring due to GSettings");
+ g_debug ("ignoring due to GSettings");
return FALSE;
}
@@ -763,7 +760,7 @@ gpk_check_update_check_on_battery (GpkCheckUpdate *cupdate)
_("Install the updates anyway"), gpk_check_update_libnotify_cb, cupdate, NULL);
ret = notify_notification_show (notification, &error);
if (!ret) {
- egg_warning ("error: %s", error->message);
+ g_warning ("error: %s", error->message);
g_error_free (error);
}
@@ -800,7 +797,7 @@ gpk_check_update_notify_doing_updates (GpkCheckUpdate *cupdate)
// _("Do not show this again"), gpk_check_update_libnotify_cb, cupdate, NULL);
ret = notify_notification_show (notification, &error);
if (!ret) {
- egg_warning ("error: %s", error->message);
+ g_warning ("error: %s", error->message);
g_error_free (error);
}
out:
@@ -830,7 +827,7 @@ gpk_check_update_get_updates_finished_cb (GObject *object, GAsyncResult *res, Gp
/* get the results */
results = pk_client_generic_finish (PK_CLIENT(client), res, &error);
if (results == NULL) {
- egg_warning ("failed to get updates: %s", error->message);
+ g_warning ("failed to get updates: %s", error->message);
g_error_free (error);
goto out;
}
@@ -838,7 +835,7 @@ gpk_check_update_get_updates_finished_cb (GObject *object, GAsyncResult *res, Gp
/* check error code */
error_code = pk_results_get_error_code (results);
if (error_code != NULL) {
- egg_warning ("failed to get updates: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ g_warning ("failed to get updates: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
gpk_check_update_show_error (cupdate, error_code);
goto out;
}
@@ -851,7 +848,7 @@ gpk_check_update_get_updates_finished_cb (GObject *object, GAsyncResult *res, Gp
/* we have no updates */
if (array->len == 0) {
- egg_debug ("no updates");
+ g_debug ("no updates");
gpk_check_update_set_gicon (cupdate, NULL);
goto out;
}
@@ -871,7 +868,7 @@ gpk_check_update_get_updates_finished_cb (GObject *object, GAsyncResult *res, Gp
/* work out icon */
icon = gpk_check_update_get_status_icon (cupdate, array);
if (icon == NULL) {
- egg_debug ("all updates blocked");
+ g_debug ("all updates blocked");
gpk_check_update_set_gicon (cupdate, NULL);
goto out;
}
@@ -884,20 +881,20 @@ gpk_check_update_get_updates_finished_cb (GObject *object, GAsyncResult *res, Gp
/* if we are just refreshing after a failed update, don't try to do the actions */
if (FALSE) { //TODO
- egg_debug ("skipping actions");
+ g_debug ("skipping actions");
goto out;
}
/* do we do the automatic updates? */
update = g_settings_get_enum (cupdate->priv->settings, GPK_SETTINGS_AUTO_UPDATE);
if (update == GPK_UPDATE_ENUM_UNKNOWN) {
- egg_warning ("policy unknown");
+ g_warning ("policy unknown");
goto out;
}
/* is policy none? */
if (update == GPK_UPDATE_ENUM_NONE) {
- egg_debug ("not updating as policy NONE");
+ g_debug ("not updating as policy NONE");
/* TODO: use ca_gtk_context_get_for_screen to allow use of GDK_MULTIHEAD_SAFE */
@@ -921,7 +918,7 @@ gpk_check_update_get_updates_finished_cb (GObject *object, GAsyncResult *res, Gp
if (!ret &&
((update == GPK_UPDATE_ENUM_SECURITY && security_array->len > 0) ||
update == GPK_UPDATE_ENUM_ALL)) {
- egg_debug ("on battery so not doing update");
+ g_debug ("on battery so not doing update");
/* play the sound, using sounds from the naming spec */
ca_context_play (ca_gtk_context_get (), 0,
@@ -941,7 +938,7 @@ gpk_check_update_get_updates_finished_cb (GObject *object, GAsyncResult *res, Gp
/* just do security updates */
if (update == GPK_UPDATE_ENUM_SECURITY) {
if (security_array->len == 0) {
- egg_debug ("policy security, but none available");
+ g_debug ("policy security, but none available");
goto out;
}
@@ -956,7 +953,7 @@ gpk_check_update_get_updates_finished_cb (GObject *object, GAsyncResult *res, Gp
/* just do everything */
if (update == GPK_UPDATE_ENUM_ALL) {
- egg_debug ("we should do the update automatically!");
+ g_debug ("we should do the update automatically!");
pk_task_update_system_async (cupdate->priv->task, cupdate->priv->cancellable, NULL, NULL,
(GAsyncReadyCallback) gpk_check_update_update_system_finished_cb, cupdate);
gpk_check_update_notify_doing_updates (cupdate);
@@ -964,7 +961,7 @@ gpk_check_update_get_updates_finished_cb (GObject *object, GAsyncResult *res, Gp
}
/* shouldn't happen */
- egg_warning ("unknown update mode");
+ g_warning ("unknown update mode");
out:
if (icon != NULL)
g_object_unref (icon);
@@ -996,7 +993,7 @@ gpk_check_update_get_active_roles_for_tids (GpkCheckUpdate *cupdate, gchar **tid
/* get progress */
progress = pk_client_get_progress (PK_CLIENT(cupdate->priv->task), tids[i], cupdate->priv->cancellable, &error);
if (progress == NULL) {
- egg_warning ("failed to get progress of %s: %s", tids[i], error->message);
+ g_warning ("failed to get progress of %s: %s", tids[i], error->message);
g_error_free (error);
goto out;
}
@@ -1041,7 +1038,7 @@ gpk_check_update_query_updates (GpkCheckUpdate *cupdate)
if (pk_bitfield_contain (roles, PK_ROLE_ENUM_GET_UPDATES) ||
pk_bitfield_contain (roles, PK_ROLE_ENUM_UPDATE_PACKAGES) ||
pk_bitfield_contain (roles, PK_ROLE_ENUM_UPDATE_SYSTEM)) {
- egg_debug ("Not checking for updates as already in progress");
+ g_debug ("Not checking for updates as already in progress");
goto out;
}
@@ -1060,7 +1057,7 @@ out:
static gboolean
gpk_check_update_query_updates_changed_cb (GpkCheckUpdate *cupdate)
{
- egg_debug ("getting new update list (after we waited a short delay)");
+ g_debug ("getting new update list (after we waited a short delay)");
cupdate->priv->updates_changed_id = 0;
gpk_check_update_query_updates (cupdate);
return FALSE;
@@ -1079,7 +1076,7 @@ gpk_check_update_updates_changed_cb (PkControl *control, GpkCheckUpdate *cupdate
/* if we don't want to auto check for updates, don't do this either */
thresh = g_settings_get_int (cupdate->priv->settings, GPK_SETTINGS_FREQUENCY_GET_UPDATES);
if (thresh == 0) {
- egg_debug ("not when policy is to never get updates");
+ g_debug ("not when policy is to never get updates");
return;
}
@@ -1091,7 +1088,7 @@ gpk_check_update_updates_changed_cb (PkControl *control, GpkCheckUpdate *cupdate
gpk_check_update_set_gicon (cupdate, NULL);
/* now try to get newest update list */
- egg_debug ("updates changed, so getting new update list in %is", GPK_CHECK_UPDATE_UPDATES_CHANGED_TIMEOUT);
+ g_debug ("updates changed, so getting new update list in %is", GPK_CHECK_UPDATE_UPDATES_CHANGED_TIMEOUT);
cupdate->priv->updates_changed_id =
g_timeout_add_seconds (GPK_CHECK_UPDATE_UPDATES_CHANGED_TIMEOUT,
(GSourceFunc) gpk_check_update_query_updates_changed_cb, cupdate);
@@ -1115,10 +1112,10 @@ gpk_check_update_restart_schedule_cb (PkClient *client, GpkCheckUpdate *cupdate)
g_usleep (2*G_USEC_PER_SEC);
file = BINDIR "/gpk-update-icon";
- egg_debug ("trying to spawn: %s", file);
+ g_debug ("trying to spawn: %s", file);
ret = g_spawn_command_line_async (file, &error);
if (!ret) {
- egg_warning ("failed to spawn new instance: %s", error->message);
+ g_warning ("failed to spawn new instance: %s", error->message);
g_error_free (error);
}
}
@@ -1140,7 +1137,6 @@ gpk_check_update_transaction_list_changed_cb (PkControl *control, gchar **transa
gpk_check_update_set_icon_visibility (cupdate);
}
-
/**
* gpk_check_update_refresh_cache_finished_cb:
**/
@@ -1155,7 +1151,7 @@ gpk_check_update_refresh_cache_finished_cb (GObject *object, GAsyncResult *res,
/* get the results */
results = pk_client_generic_finish (PK_CLIENT(client), res, &error);
if (results == NULL) {
- egg_warning ("failed to refresh the cache: %s", error->message);
+ g_warning ("failed to refresh the cache: %s", error->message);
g_error_free (error);
goto out;
}
@@ -1163,7 +1159,7 @@ gpk_check_update_refresh_cache_finished_cb (GObject *object, GAsyncResult *res,
/* check error code */
error_code = pk_results_get_error_code (results);
if (error_code != NULL) {
- egg_warning ("failed to refresh the cache: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ g_warning ("failed to refresh the cache: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
gpk_check_update_show_error (cupdate, error_code);
goto out;
}
@@ -1187,7 +1183,7 @@ gpk_check_update_auto_refresh_cache_cb (GpkAutoRefresh *arefresh, GpkCheckUpdate
/* No point if we are already updating */
roles = gpk_check_update_get_active_roles (cupdate);
if (pk_bitfield_contain (roles, PK_ROLE_ENUM_REFRESH_CACHE)) {
- egg_debug ("Not refreshing cache as already in progress");
+ g_debug ("Not refreshing cache as already in progress");
goto out;
}
@@ -1206,7 +1202,7 @@ gpk_check_update_auto_get_updates_cb (GpkAutoRefresh *arefresh, GpkCheckUpdate *
g_return_if_fail (GPK_IS_CHECK_UPDATE (cupdate));
/* show the icon at login time */
- egg_debug ("login cb");
+ g_debug ("login cb");
gpk_check_update_query_updates (cupdate);
}
@@ -1233,7 +1229,7 @@ gpk_check_update_get_distro_upgrades_finished_cb (GObject *object, GAsyncResult
/* get the results */
results = pk_client_generic_finish (PK_CLIENT(client), res, &error);
if (results == NULL) {
- egg_warning ("failed to get upgrades: %s", error->message);
+ g_warning ("failed to get upgrades: %s", error->message);
g_error_free (error);
goto out;
}
@@ -1241,7 +1237,7 @@ gpk_check_update_get_distro_upgrades_finished_cb (GObject *object, GAsyncResult
/* check error code */
error_code = pk_results_get_error_code (results);
if (error_code != NULL) {
- egg_warning ("failed to get upgrades: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ g_warning ("failed to get upgrades: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
gpk_check_update_show_error (cupdate, error_code);
goto out;
}
@@ -1251,14 +1247,14 @@ gpk_check_update_get_distro_upgrades_finished_cb (GObject *object, GAsyncResult
/* any updates? */
if (array->len == 0) {
- egg_debug ("no upgrades");
+ g_debug ("no upgrades");
goto out;
}
/* do we do the notification? */
ret = g_settings_get_boolean (cupdate->priv->settings, GPK_SETTINGS_NOTIFY_DISTRO_UPGRADES);
if (!ret) {
- egg_debug ("ignoring due to GSettings");
+ g_debug ("ignoring due to GSettings");
goto out;
}
@@ -1280,7 +1276,7 @@ gpk_check_update_get_distro_upgrades_finished_cb (GObject *object, GAsyncResult
title = _("Distribution upgrades available");
notification = notify_notification_new (title, string->str, NULL);
if (notification == NULL) {
- egg_warning ("failed to make bubble");
+ g_warning ("failed to make bubble");
goto out;
}
notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER);
@@ -1293,7 +1289,7 @@ gpk_check_update_get_distro_upgrades_finished_cb (GObject *object, GAsyncResult
_("Do not show this again"), gpk_check_update_libnotify_cb, cupdate, NULL);
ret = notify_notification_show (notification, &error);
if (!ret) {
- egg_warning ("error: %s", error->message);
+ g_warning ("error: %s", error->message);
g_error_free (error);
}
out:
@@ -1319,7 +1315,7 @@ gpk_check_update_auto_get_upgrades_cb (GpkAutoRefresh *arefresh, GpkCheckUpdate
/* No point if we are already updating */
roles = gpk_check_update_get_active_roles (cupdate);
if (pk_bitfield_contain (roles, PK_ROLE_ENUM_GET_DISTRO_UPGRADES)) {
- egg_debug ("Not checking for upgrades as already in progress");
+ g_debug ("Not checking for upgrades as already in progress");
goto out;
}
@@ -1353,7 +1349,7 @@ gpk_cupdate_connection_changed_cb (EggDbusMonitor *monitor, gboolean connected,
{
g_return_if_fail (GPK_IS_CHECK_UPDATE (cupdate));
/* inhibit icon when update viewer open */
- egg_debug ("update viewer on the bus: %i", connected);
+ g_debug ("update viewer on the bus: %i", connected);
cupdate->priv->icon_inhibit_update_viewer_connected = connected;
gpk_check_update_set_icon_visibility (cupdate);
}
@@ -1374,7 +1370,7 @@ gpk_check_update_get_properties_cb (GObject *object, GAsyncResult *res, GpkCheck
ret = pk_control_get_properties_finish (control, res, &error);
if (!ret) {
/* TRANSLATORS: backend is broken, and won't tell us what it supports */
- egg_warning ("details could not be retrieved: %s", error->message);
+ g_warning ("details could not be retrieved: %s", error->message);
g_error_free (error);
goto out;
}
@@ -1406,7 +1402,7 @@ gpk_check_update_file_exist_in_root (const gchar *root, const gchar *filename)
/* an interesting file exists */
ret = g_file_query_exists (source, NULL);
- egg_debug ("checking for %s: %s", source_path, ret ? "yes" : "no");
+ g_debug ("checking for %s: %s", source_path, ret ? "yes" : "no");
if (!ret)
goto out;
out:
@@ -1435,7 +1431,7 @@ gpk_check_update_mount_added_cb (GVolumeMonitor *volume_monitor, GMount *mount,
/* use settings */
media_repo_filenames = g_settings_get_string (cupdate->priv->settings, GPK_SETTINGS_MEDIA_REPO_FILENAMES);
if (media_repo_filenames == NULL) {
- egg_warning ("failed to get media repo filenames");
+ g_warning ("failed to get media repo filenames");
goto out;
}
diff --git a/src/gpk-common.c b/src/gpk-common.c
index 53b5c89..a812511 100644
--- a/src/gpk-common.c
+++ b/src/gpk-common.c
@@ -32,7 +32,6 @@
#include <packagekit-glib2/packagekit.h>
#include <locale.h>
-#include "egg-debug.h"
#include "egg-string.h"
#include "egg-console-kit.h"
@@ -234,11 +233,11 @@ gpk_window_set_size_request (GtkWindow *window, guint width, guint height)
/* find percentage of screen area */
percent_w = (width * 100) / screen_w;
percent_h = (height * 100) / screen_h;
- egg_debug ("window coverage x:%i%% y:%i%%", percent_w, percent_h);
+ g_debug ("window coverage x:%i%% y:%i%%", percent_w, percent_h);
if (percent_w > GPK_SMALL_FORM_FACTOR_SCREEN_PERCENT ||
percent_h > GPK_SMALL_FORM_FACTOR_SCREEN_PERCENT) {
- egg_debug ("using small form factor mode as %ix%i and requested %ix%i",
+ g_debug ("using small form factor mode as %ix%i and requested %ix%i",
screen_w, screen_h, width, height);
gtk_window_maximize (window);
small_form_factor_mode = TRUE;
@@ -250,7 +249,7 @@ gpk_window_set_size_request (GtkWindow *window, guint width, guint height)
goto out;
#endif
/* normal size laptop panel */
- egg_debug ("using native mode: %ix%i", width, height);
+ g_debug ("using native mode: %ix%i", width, height);
gtk_window_set_default_size (window, width, height);
small_form_factor_mode = FALSE;
out:
@@ -279,7 +278,6 @@ gpk_window_set_parent_xid (GtkWindow *window, guint32 xid)
return TRUE;
}
-
/**
* gpk_package_id_format_twoline:
*
@@ -298,7 +296,7 @@ gpk_package_id_format_twoline (const gchar *package_id, const gchar *summary)
/* optional */
split = pk_package_id_split (package_id);
if (split == NULL) {
- egg_warning ("could not parse %s", package_id);
+ g_warning ("could not parse %s", package_id);
goto out;
}
if (summary == NULL || summary[PK_PACKAGE_ID_NAME] == '\0') {
@@ -391,7 +389,7 @@ gpk_check_privileged_user (const gchar *application_name, gboolean show_ui)
/* user did not agree to run insecure */
if (result != GTK_RESPONSE_OK) {
ret = FALSE;
- egg_warning ("uid=%i so closing", uid);
+ g_warning ("uid=%i so closing", uid);
goto out;
}
}
@@ -614,7 +612,7 @@ gpk_package_entry_completion_get_names_from_file (const gchar *filename)
/* get data */
ret = g_file_get_contents (filename, &data, NULL, &error);
if (!ret) {
- egg_warning ("failed to open package list: %s", error->message);
+ g_warning ("failed to open package list: %s", error->message);
g_error_free (error);
goto out;
}
@@ -664,15 +662,15 @@ gpk_package_entry_completion_model_new (void)
hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
list = gpk_package_entry_completion_get_names_from_file (PK_SYSTEM_PACKAGE_LIST_FILENAME);
if (list == NULL) {
- egg_warning ("no package list, try refreshing");
+ g_warning ("no package list, try refreshing");
return NULL;
}
- egg_debug ("loading %i autocomplete items", list->len);
+ g_debug ("loading %i autocomplete items", list->len);
for (i=0; i<list->len; i++) {
item = g_ptr_array_index (list, i);
if (item == NULL || pk_package_get_id (item) == NULL) {
- egg_warning ("item invalid!");
+ g_warning ("item invalid!");
break;
}
diff --git a/src/gpk-dbus-service.c b/src/gpk-dbus-service.c
index 9c22eb5..5216f8a 100644
--- a/src/gpk-dbus-service.c
+++ b/src/gpk-dbus-service.c
@@ -28,11 +28,12 @@
#include <libnotify/notify.h>
#include <packagekit-glib2/packagekit.h>
-#include "egg-debug.h"
#include "egg-dbus-monitor.h"
#include "gpk-common.h"
#include "gpk-dbus.h"
+#include "gpk-debug.h"
+
#include "org.freedesktop.PackageKit.h"
static GMainLoop *loop = NULL;
@@ -69,7 +70,7 @@ gpk_dbus_service_object_register (DBusGConnection *connection, GObject *object)
G_TYPE_INVALID);
if (!ret) {
/* abort as the DBUS method failed */
- egg_warning ("RequestName failed: %s", error->message);
+ g_warning ("RequestName failed: %s", error->message);
g_error_free (error);
return FALSE;
}
@@ -99,7 +100,7 @@ gpk_dbus_service_check_idle_cb (GpkDbus *dbus)
/* get the idle time */
idle = gpk_dbus_get_idle_time (dbus);
if (idle > GPK_SESSION_IDLE_EXIT) {
- egg_debug ("exiting loop as idle");
+ g_debug ("exiting loop as idle");
g_main_loop_quit (loop);
return FALSE;
}
@@ -113,7 +114,7 @@ gpk_dbus_service_check_idle_cb (GpkDbus *dbus)
static void
gpk_dbus_service_connection_replaced_cb (EggDbusMonitor *monitor, gpointer data)
{
- egg_warning ("exiting as we have been replaced");
+ g_warning ("exiting as we have been replaced");
g_main_loop_quit (loop);
}
@@ -156,7 +157,7 @@ main (int argc, char *argv[])
context = g_option_context_new (NULL);
g_option_context_set_summary (context, _("Session DBus service for PackageKit"));
g_option_context_add_main_entries (context, options, NULL);
- g_option_context_add_group (context, egg_debug_get_option_group ());
+ g_option_context_add_group (context, gpk_debug_get_option_group ());
g_option_context_add_group (context, gtk_get_option_group (TRUE));
g_option_context_parse (context, &argc, &argv, NULL);
g_option_context_free (context);
@@ -176,7 +177,7 @@ main (int argc, char *argv[])
/* get the bus */
connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
if (error) {
- egg_warning ("%s", error->message);
+ g_warning ("%s", error->message);
g_error_free (error);
retval = 1;
goto out;
@@ -185,7 +186,7 @@ main (int argc, char *argv[])
/* try to register */
ret = gpk_dbus_service_object_register (connection, G_OBJECT (dbus));
if (!ret) {
- egg_warning ("failed to replace running instance.");
+ g_warning ("failed to replace running instance.");
retval = 1;
goto out;
}
diff --git a/src/gpk-dbus-task.c b/src/gpk-dbus-task.c
index d3142db..2b01abe 100644
--- a/src/gpk-dbus-task.c
+++ b/src/gpk-dbus-task.c
@@ -33,7 +33,6 @@
#include <libnotify/notify.h>
#include <packagekit-glib2/packagekit.h>
-#include "egg-debug.h"
#include "egg-string.h"
#include "gpk-common.h"
@@ -116,7 +115,7 @@ gpk_dbus_task_set_interaction (GpkDbusTask *dtask, PkBitfield interact)
dtask->priv->show_warning = pk_bitfield_contain (interact, GPK_CLIENT_INTERACT_WARNING);
/* debug */
- egg_debug ("confirm_search:%i, confirm_deps:%i, confirm_install:%i, progress:%i, finished:%i, warning:%i",
+ g_debug ("confirm_search:%i, confirm_deps:%i, confirm_install:%i, progress:%i, finished:%i, warning:%i",
dtask->priv->show_confirm_search, dtask->priv->show_confirm_deps,
dtask->priv->show_confirm_install, dtask->priv->show_progress,
dtask->priv->show_finished, dtask->priv->show_warning);
@@ -148,7 +147,7 @@ gpk_dbus_task_set_xid (GpkDbusTask *dtask, guint32 xid)
display = gdk_display_get_default ();
dtask->priv->parent_window = gdk_window_foreign_new_for_display (display, xid);
- egg_debug ("parent_window=%p", dtask->priv->parent_window);
+ g_debug ("parent_window=%p", dtask->priv->parent_window);
gpk_modal_dialog_set_parent (dtask->priv->dialog, dtask->priv->parent_window);
return TRUE;
}
@@ -176,12 +175,12 @@ gpk_dbus_task_dbus_return_error (GpkDbusTask *dtask, const GError *error)
/* already sent or never setup */
if (dtask->priv->context == NULL) {
- egg_error ("context does not exist, cannot return: %s", error->message);
+ g_error ("context does not exist, cannot return: %s", error->message);
goto out;
}
/* send error */
- egg_debug ("sending async return error in response to %p: %s", dtask->priv->context, error->message);
+ g_debug ("sending async return error in response to %p: %s", dtask->priv->context, error->message);
dbus_g_method_return_error (dtask->priv->context, error);
/* set context NULL just in case we try to repeat */
@@ -203,12 +202,12 @@ gpk_dbus_task_dbus_return_value (GpkDbusTask *dtask, gboolean ret)
{
/* already sent or never setup */
if (dtask->priv->context == NULL) {
- egg_error ("context does not exist, cannot return %i", ret);
+ g_error ("context does not exist, cannot return %i", ret);
goto out;
}
/* send error */
- egg_debug ("sending async return in response to %p: %i", dtask->priv->context, ret);
+ g_debug ("sending async return in response to %p: %i", dtask->priv->context, ret);
dbus_g_method_return (dtask->priv->context, ret);
/* set context NULL just in case we try to repeat */
@@ -269,7 +268,7 @@ gpk_dbus_task_libnotify_cb (NotifyNotification *notification, gchar *action, gpo
gchar *details;
if (task->priv->cached_error_code == NULL) {
- egg_warning ("called show error with no error!");
+ g_warning ("called show error with no error!");
return;
}
if (g_strcmp0 (action, "show-error-details") == 0) {
@@ -278,7 +277,7 @@ gpk_dbus_task_libnotify_cb (NotifyNotification *notification, gchar *action, gpo
gpk_error_dialog (_("Error details"), _("Package Manager error details"), details);
g_free (details);
} else {
- egg_warning ("unknown action id: %s", action);
+ g_warning ("unknown action id: %s", action);
}
}
@@ -356,10 +355,10 @@ gpk_dbus_task_handle_error (GpkDbusTask *dtask, PkError *error_code)
if (pk_error_get_code (error_code) == PK_ERROR_ENUM_NO_LICENSE_AGREEMENT ||
pk_error_get_code (error_code) == PK_ERROR_ENUM_PROCESS_KILL ||
pk_error_get_code (error_code) == PK_ERROR_ENUM_TRANSACTION_CANCELLED) {
- egg_warning ("ignoring %s", pk_error_enum_to_text (pk_error_get_code (error_code)));
+ g_warning ("ignoring %s", pk_error_enum_to_text (pk_error_get_code (error_code)));
}
- egg_debug ("code was %s", pk_error_enum_to_text (pk_error_get_code (error_code)));
+ g_debug ("code was %s", pk_error_enum_to_text (pk_error_get_code (error_code)));
/* use a modal dialog if showing progress, else use libnotify */
title = gpk_error_enum_to_localised_text (pk_error_get_code (error_code));
@@ -384,7 +383,7 @@ gpk_dbus_task_handle_error (GpkDbusTask *dtask, PkError *error_code)
_("Show details"), gpk_dbus_task_libnotify_cb, dtask, NULL);
ret = notify_notification_show (notification, &error);
if (!ret) {
- egg_warning ("error: %s", error->message);
+ g_warning ("error: %s", error->message);
g_error_free (error);
}
}
@@ -405,7 +404,7 @@ gpk_dbus_task_get_code_from_gerror (const GError *error)
/* not recognised */
if (error->domain != PK_CLIENT_ERROR) {
- egg_warning ("Not a PkClientError error code");
+ g_warning ("Not a PkClientError error code");
goto out;
}
@@ -480,7 +479,7 @@ gpk_dbus_task_install_packages_cb (PkTask *task, GAsyncResult *res, GpkDbusTask
/* check error code */
error_code = pk_results_get_error_code (results);
if (error_code != NULL) {
- egg_warning ("failed to install package: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ g_warning ("failed to install package: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
error_dbus = g_error_new (GPK_DBUS_ERROR, gpk_dbus_task_get_code_from_pkerror (error_code), "%s", pk_error_get_details (error_code));
gpk_dbus_task_handle_error (dtask, error_code);
gpk_dbus_task_dbus_return_error (dtask, error_dbus);
@@ -546,7 +545,7 @@ gpk_dbus_task_set_status (GpkDbusTask *dtask, PkStatusEnum status)
/* ignore */
if (!dtask->priv->show_progress) {
- egg_warning ("not showing progress");
+ g_warning ("not showing progress");
return FALSE;
}
@@ -621,7 +620,7 @@ gpk_dbus_task_install_files_cb (PkTask *task, GAsyncResult *res, GpkDbusTask *dt
/* check error code */
error_code = pk_results_get_error_code (results);
if (error_code != NULL) {
- egg_warning ("failed to install file: %s, %s",
+ g_warning ("failed to install file: %s, %s",
pk_error_enum_to_text (pk_error_get_code (error_code)),
pk_error_get_details (error_code));
gpk_dbus_task_handle_error (dtask, error_code);
@@ -787,7 +786,7 @@ gpk_dbus_task_progress_cb (PkProgress *progress, PkProgressType type, GpkDbusTas
NULL);
if (type == PK_PROGRESS_TYPE_PACKAGE_ID) {
- egg_debug ("_package");
+ g_debug ("_package");
} else if (type == PK_PROGRESS_TYPE_PERCENTAGE) {
gpk_modal_dialog_set_percentage (dtask->priv->dialog, percentage);
} else if (type == PK_PROGRESS_TYPE_ALLOW_CANCEL) {
@@ -828,7 +827,7 @@ gpk_dbus_task_is_installed_resolve_cb (PkClient *client, GAsyncResult *res, GpkD
if (results == NULL) {
error_dbus = g_error_new (GPK_DBUS_ERROR, gpk_dbus_task_get_code_from_gerror (error), "failed to resolve: %s", error->message);
gpk_dbus_task_dbus_return_error (dtask, error_dbus);
- egg_warning ("failed to resolve: %s", error->message);
+ g_warning ("failed to resolve: %s", error->message);
g_error_free (error);
goto out;
}
@@ -836,7 +835,7 @@ gpk_dbus_task_is_installed_resolve_cb (PkClient *client, GAsyncResult *res, GpkD
/* check error code */
error_code = pk_results_get_error_code (results);
if (error_code != NULL) {
- egg_warning ("failed to resolve: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ g_warning ("failed to resolve: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
error_dbus = g_error_new (GPK_DBUS_ERROR, gpk_dbus_task_get_code_from_pkerror (error_code), "failed to resolve: %s", pk_error_get_details (error_code));
gpk_dbus_task_dbus_return_error (dtask, error_dbus);
g_error_free (error_dbus);
@@ -900,7 +899,7 @@ gpk_dbus_task_search_file_search_file_cb (PkClient *client, GAsyncResult *res, G
if (results == NULL) {
error_dbus = g_error_new (GPK_DBUS_ERROR, gpk_dbus_task_get_code_from_gerror (error), "failed to search file: %s", error->message);
gpk_dbus_task_dbus_return_error (dtask, error_dbus);
- egg_warning ("failed to resolve: %s", error->message);
+ g_warning ("failed to resolve: %s", error->message);
g_error_free (error);
g_error_free (error_dbus);
goto out;
@@ -909,7 +908,7 @@ gpk_dbus_task_search_file_search_file_cb (PkClient *client, GAsyncResult *res, G
/* check error code */
error_code = pk_results_get_error_code (results);
if (error_code != NULL) {
- egg_warning ("failed to resolve: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ g_warning ("failed to resolve: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
error_dbus = g_error_new (GPK_DBUS_ERROR, gpk_dbus_task_get_code_from_pkerror (error_code), "failed to search file: %s", pk_error_get_details (error_code));
gpk_dbus_task_dbus_return_error (dtask, error_dbus);
g_error_free (error_dbus);
@@ -919,7 +918,7 @@ gpk_dbus_task_search_file_search_file_cb (PkClient *client, GAsyncResult *res, G
/* get results */
array = pk_results_get_package_array (results);
if (array->len == 0) {
- egg_warning ("no packages");
+ g_warning ("no packages");
error_dbus = g_error_new (GPK_DBUS_ERROR, GPK_DBUS_ERROR_FAILED, "failed to find any packages");
gpk_dbus_task_dbus_return_error (dtask, error_dbus);
g_error_free (error_dbus);
@@ -935,7 +934,7 @@ gpk_dbus_task_search_file_search_file_cb (PkClient *client, GAsyncResult *res, G
split = pk_package_id_split (package_id);
/* send error */
- egg_debug ("sending async return in response to %p", dtask->priv->context);
+ g_debug ("sending async return in response to %p", dtask->priv->context);
dbus_g_method_return (dtask->priv->context, (info == PK_INFO_ENUM_INSTALLED), split[PK_PACKAGE_ID_NAME]);
/* set context NULL just in case we try to repeat */
@@ -967,7 +966,7 @@ gpk_dbus_task_search_file (GpkDbusTask *dtask, const gchar *search_file, GpkDbus
dtask->priv->finished_userdata = userdata;
/* get the package list for the installed packages */
- egg_debug ("package_name=%s", search_file);
+ g_debug ("package_name=%s", search_file);
values = g_strsplit (search_file, "&", -1);
pk_client_search_files_async (PK_CLIENT(dtask->priv->task), pk_bitfield_value (PK_FILTER_ENUM_NEWEST), values, NULL,
(PkProgressCallback) gpk_dbus_task_progress_cb, dtask,
@@ -1117,7 +1116,7 @@ gpk_dbus_task_install_package_names_resolve_cb (PkTask *task, GAsyncResult *res,
if (info == PK_INFO_ENUM_INSTALLED) {
already_installed = TRUE;
} else if (info == PK_INFO_ENUM_AVAILABLE) {
- egg_debug ("package '%s' resolved", package_id_tmp);
+ g_debug ("package '%s' resolved", package_id_tmp);
package_id = g_strdup (package_id_tmp);
//TODO: we need to list these in a gpk-dbus_task-chooser
}
@@ -1206,7 +1205,7 @@ gpk_dbus_task_install_package_names (GpkDbusTask *dtask, gchar **packages, GpkDb
/* optional */
if (!dtask->priv->show_confirm_install) {
- egg_debug ("skip confirm as not allowed to interact with user");
+ g_debug ("skip confirm as not allowed to interact with user");
goto skip_checks;
}
@@ -1354,7 +1353,7 @@ gpk_dbus_task_install_provide_files_search_file_cb (PkClient *client, GAsyncResu
already_installed = TRUE;
package_id = g_strdup (package_id_tmp);
} else if (info == PK_INFO_ENUM_AVAILABLE) {
- egg_debug ("package '%s' resolved to:", package_id_tmp);
+ g_debug ("package '%s' resolved to:", package_id_tmp);
package_id = g_strdup (package_id_tmp);
}
g_free (package_id_tmp);
@@ -1426,7 +1425,7 @@ gpk_dbus_task_install_provide_files (GpkDbusTask *dtask, gchar **full_paths, Gpk
/* optional */
if (!dtask->priv->show_confirm_search) {
- egg_debug ("skip confirm as not allowed to interact with user");
+ g_debug ("skip confirm as not allowed to interact with user");
goto skip_checks;
}
@@ -1651,7 +1650,7 @@ gpk_dbus_task_codec_what_provides_cb (PkClient *client, GAsyncResult *res, GpkDb
/* optional */
if (!dtask->priv->show_confirm_install) {
- egg_debug ("skip confirm as not allowed to interact with user");
+ g_debug ("skip confirm as not allowed to interact with user");
goto skip_checks2;
}
@@ -1732,7 +1731,7 @@ gpk_dbus_task_install_gstreamer_resources (GpkDbusTask *dtask, gchar **codec_nam
/* optional */
if (!dtask->priv->show_confirm_search) {
- egg_debug ("skip confirm as not allowed to interact with user");
+ g_debug ("skip confirm as not allowed to interact with user");
goto skip_checks;
}
@@ -1903,7 +1902,7 @@ gpk_dbus_task_install_mime_types (GpkDbusTask *dtask, gchar **mime_types, GpkDbu
/* optional */
if (!dtask->priv->show_confirm_search) {
- egg_debug ("skip confirm as not allowed to interact with user");
+ g_debug ("skip confirm as not allowed to interact with user");
goto skip_checks;
}
@@ -1977,13 +1976,13 @@ gpk_dbus_task_font_tag_to_lang (const gchar *tag)
/* parse the tag */
pat = FcNameParse ((FcChar8 *) tag);
if (pat == NULL) {
- egg_warning ("cannot parse: '%s'", tag);
+ g_warning ("cannot parse: '%s'", tag);
goto out;
}
FcPatternPrint (pat);
res = FcPatternGetString (pat, FC_LANG, 0, &fclang);
if (res != FcResultMatch) {
- egg_warning ("failed to get string for: '%s': %i", tag, res);
+ g_warning ("failed to get string for: '%s': %i", tag, res);
goto out;
}
lang = g_strdup ((gchar *) fclang);
@@ -2004,7 +2003,6 @@ out:
return lang;
}
-
/**
* gpk_dbus_task_font_tag_to_localised_name:
**/
@@ -2113,7 +2111,7 @@ gpk_dbus_task_fontconfig_what_provides_cb (PkClient *client, GAsyncResult *res,
/* optional */
if (!dtask->priv->show_confirm_install) {
- egg_debug ("skip confirm as not allowed to interact with user");
+ g_debug ("skip confirm as not allowed to interact with user");
goto skip_checks;
}
@@ -2240,7 +2238,7 @@ gpk_dbus_task_install_fontconfig_resources (GpkDbusTask *dtask, gchar **fonts, G
/* optional */
if (!dtask->priv->show_confirm_search) {
- egg_debug ("skip confirm as not allowed to interact with user");
+ g_debug ("skip confirm as not allowed to interact with user");
goto skip_checks;
}
@@ -2383,7 +2381,7 @@ gpk_dbus_task_catalog_lookup_cb (GObject *object, GAsyncResult *res, GpkDbusTask
/* optional */
if (!dtask->priv->show_confirm_install) {
- egg_debug ("skip confirm as not allowed to interact with user");
+ g_debug ("skip confirm as not allowed to interact with user");
goto skip_checks;
}
@@ -2504,7 +2502,7 @@ gpk_dbus_task_printer_driver_what_provides_cb (PkClient *client, GAsyncResult *r
/* optional */
if (!dtask->priv->show_confirm_install) {
- egg_debug ("skip confirm as not allowed to interact with user");
+ g_debug ("skip confirm as not allowed to interact with user");
goto skip_checks2;
}
@@ -2609,7 +2607,7 @@ gpk_dbus_task_install_printer_drivers (GpkDbusTask *dtask, gchar **device_ids, G
g_strfreev (fields);
if (!mfg || !mdl) {
- egg_warning("invalid line '%s', missing field",
+ g_warning("invalid line '%s', missing field",
device_ids[i]);
continue;
}
@@ -2692,7 +2690,7 @@ gpk_dbus_task_remove_package_by_file_search_file_cb (PkClient *client, GAsyncRes
if (results == NULL) {
error_dbus = g_error_new (GPK_DBUS_ERROR, gpk_dbus_task_get_code_from_gerror (error), "failed to search by file: %s", error->message);
gpk_dbus_task_dbus_return_error (dtask, error_dbus);
- egg_warning ("failed to resolve: %s", error->message);
+ g_warning ("failed to resolve: %s", error->message);
g_error_free (error);
g_error_free (error_dbus);
goto out;
@@ -2773,7 +2771,7 @@ gpk_dbus_task_remove_package_by_file (GpkDbusTask *dtask, gchar **full_paths, Gp
/* optional */
if (!dtask->priv->show_confirm_search) {
- egg_debug ("skip confirm as not allowed to interact with user");
+ g_debug ("skip confirm as not allowed to interact with user");
goto skip_checks;
}
@@ -2856,7 +2854,7 @@ gpk_dbus_task_install_catalogs (GpkDbusTask *dtask, gchar **filenames, GpkDbusTa
/* optional */
if (!dtask->priv->show_confirm_search) {
- egg_debug ("skip confirm as not allowed to interact with user");
+ g_debug ("skip confirm as not allowed to interact with user");
goto skip_checks;
}
@@ -2921,7 +2919,7 @@ gpk_dbus_task_get_package_for_exec (GpkDbusTask *dtask, const gchar *exec)
results = pk_client_search_files (PK_CLIENT(dtask->priv->task), pk_bitfield_value (PK_FILTER_ENUM_INSTALLED), values, NULL,
(PkProgressCallback) gpk_dbus_task_progress_cb, dtask, &error);
if (results == NULL) {
- egg_warning ("failed to search file: %s", error->message);
+ g_warning ("failed to search file: %s", error->message);
g_error_free (error);
goto out;
}
@@ -2931,20 +2929,20 @@ gpk_dbus_task_get_package_for_exec (GpkDbusTask *dtask, const gchar *exec)
/* nothing found */
if (array->len == 0) {
- egg_debug ("cannot find installed package that provides : %s", exec);
+ g_debug ("cannot find installed package that provides : %s", exec);
goto out;
}
/* check we have one */
if (array->len != 1)
- egg_warning ("not one return, using first");
+ g_warning ("not one return, using first");
/* copy name */
item = g_ptr_array_index (array, 0);
package_id = pk_package_get_id (item);
split = pk_package_id_split (package_id);
package = g_strdup (split[0]);
- egg_debug ("got package %s", package);
+ g_debug ("got package %s", package);
out:
g_strfreev (values);
g_strfreev (split);
@@ -3002,7 +3000,7 @@ gpk_dbus_task_set_exec (GpkDbusTask *dtask, const gchar *exec)
/* is the binary trusted, i.e. can we probe it's window properties */
if (gpk_dbus_task_path_is_trusted (exec)) {
- egg_debug ("using application window properties");
+ g_debug ("using application window properties");
/* get from window properties */
x11 = gpk_x11_new ();
gpk_x11_set_window (x11, dtask->priv->parent_window);
@@ -3013,7 +3011,7 @@ gpk_dbus_task_set_exec (GpkDbusTask *dtask, const gchar *exec)
/* get from installed database */
package = gpk_dbus_task_get_package_for_exec (dtask, exec);
- egg_debug ("got package %s", package);
+ g_debug ("got package %s", package);
/* try to get from PkDesktop */
if (package != NULL) {
@@ -3021,19 +3019,19 @@ gpk_dbus_task_set_exec (GpkDbusTask *dtask, const gchar *exec)
dtask->priv->parent_icon_name = gpk_desktop_guess_icon_name (dtask->priv->desktop, package);
/* fallback to package name */
if (dtask->priv->parent_title == NULL) {
- egg_debug ("did not get localised description for %s", package);
+ g_debug ("did not get localised description for %s", package);
dtask->priv->parent_title = g_strdup (package);
}
}
/* fallback to exec - eugh... */
if (dtask->priv->parent_title == NULL) {
- egg_debug ("did not get package for %s, using exec basename", package);
+ g_debug ("did not get package for %s, using exec basename", package);
dtask->priv->parent_title = g_path_get_basename (exec);
}
out:
g_free (package);
- egg_debug ("got name=%s, icon=%s", dtask->priv->parent_title, dtask->priv->parent_icon_name);
+ g_debug ("got name=%s, icon=%s", dtask->priv->parent_title, dtask->priv->parent_icon_name);
return TRUE;
}
@@ -3121,7 +3119,7 @@ gpk_dbus_task_init (GpkDbusTask *dtask)
dtask->priv->desktop = pk_desktop_new ();
ret = pk_desktop_open_database (dtask->priv->desktop, NULL);
if (!ret)
- egg_warning ("failed to open desktop database");
+ g_warning ("failed to open desktop database");
}
/**
@@ -3212,7 +3210,7 @@ gpk_dbus_task_test (gpointer data)
if (dtask != NULL)
egg_test_success (test, NULL);
else
- egg_warning (NULL);
+ g_warning (NULL);
/************************************************************/
egg_test_title (test, "convert tag to lang");
@@ -3220,7 +3218,7 @@ gpk_dbus_task_test (gpointer data)
if (g_strcmp0 (lang, "mn") == 0)
egg_test_success (test, NULL);
else
- egg_warning ("lang '%s'", lang);
+ g_warning ("lang '%s'", lang);
g_free (lang);
/************************************************************/
@@ -3229,7 +3227,7 @@ gpk_dbus_task_test (gpointer data)
if (g_strcmp0 (language, "Mongolian") == 0)
egg_test_success (test, NULL);
else
- egg_warning ("language '%s'", language);
+ g_warning ("language '%s'", language);
g_free (language);
/************************************************************/
@@ -3238,7 +3236,7 @@ gpk_dbus_task_test (gpointer data)
if (ret)
egg_test_success (test, NULL);
else
- egg_warning ("failed to identify trusted");
+ g_warning ("failed to identify trusted");
/************************************************************/
egg_test_title (test, "test trusted path");
@@ -3246,7 +3244,7 @@ gpk_dbus_task_test (gpointer data)
if (!ret)
egg_test_success (test, NULL);
else
- egg_warning ("identify untrusted as trusted!");
+ g_warning ("identify untrusted as trusted!");
/************************************************************/
egg_test_title (test, "get package for exec");
@@ -3254,7 +3252,7 @@ gpk_dbus_task_test (gpointer data)
if (g_strcmp0 (package, "totem") == 0)
egg_test_success (test, NULL);
else
- egg_warning ("package '%s'", package);
+ g_warning ("package '%s'", package);
g_free (package);
/************************************************************/
@@ -3263,7 +3261,7 @@ gpk_dbus_task_test (gpointer data)
if (ret)
egg_test_success (test, NULL);
else
- egg_warning ("failed to set exec");
+ g_warning ("failed to set exec");
#if 0
/************************************************************/
diff --git a/src/gpk-dbus.c b/src/gpk-dbus.c
index d18731f..8fc345f 100644
--- a/src/gpk-dbus.c
+++ b/src/gpk-dbus.c
@@ -40,7 +40,6 @@
#include <dbus/dbus-glib-lowlevel.h>
#include <packagekit-glib2/packagekit.h>
-#include "egg-debug.h"
#include "egg-string.h"
#include "gpk-dbus.h"
@@ -115,7 +114,7 @@ gpk_dbus_get_idle_time (GpkDbus *dbus)
goto out;
idle = (guint) g_timer_elapsed (dbus->priv->timer, NULL);
- egg_debug ("we've been idle for %is", idle);
+ g_debug ("we've been idle for %is", idle);
out:
return idle;
}
@@ -137,7 +136,7 @@ gpk_dbus_get_pid_session (GpkDbus *dbus, const gchar *sender)
G_TYPE_UINT, &pid,
G_TYPE_INVALID);
if (!ret) {
- egg_debug ("failed to get pid from session: %s", error->message);
+ g_debug ("failed to get pid from session: %s", error->message);
g_error_free (error);
goto out;
}
@@ -162,7 +161,7 @@ gpk_dbus_get_pid_system (GpkDbus *dbus, const gchar *sender)
G_TYPE_UINT, &pid,
G_TYPE_INVALID);
if (!ret) {
- egg_debug ("failed to get pid from system: %s", error->message);
+ g_debug ("failed to get pid from system: %s", error->message);
g_error_free (error);
goto out;
}
@@ -194,12 +193,11 @@ gpk_dbus_get_pid (GpkDbus *dbus, const gchar *sender)
goto out;
/* should be impossible */
- egg_warning ("could not find pid!");
+ g_warning ("could not find pid!");
out:
return pid;
}
-
/**
* gpk_dbus_get_exec_for_sender:
**/
@@ -217,7 +215,7 @@ gpk_dbus_get_exec_for_sender (GpkDbus *dbus, const gchar *sender)
/* get pid */
pid = gpk_dbus_get_pid (dbus, sender);
if (pid == G_MAXUINT) {
- egg_warning ("failed to get PID");
+ g_warning ("failed to get PID");
goto out;
}
@@ -225,7 +223,7 @@ gpk_dbus_get_exec_for_sender (GpkDbus *dbus, const gchar *sender)
filename = g_strdup_printf ("/proc/%i/exe", pid);
cmdline = g_file_read_link (filename, &error);
if (cmdline == NULL) {
- egg_warning ("failed to find exec: %s", error->message);
+ g_warning ("failed to find exec: %s", error->message);
g_error_free (error);
}
out:
@@ -303,19 +301,19 @@ gpk_dbus_parse_interaction (GpkDbus *dbus, const gchar *interaction, PkBitfield
/* get default policy from settings */
policy = g_settings_get_string (dbus->priv->settings, GPK_SETTINGS_DBUS_DEFAULT_INTERACTION);
if (policy != NULL) {
- egg_debug ("default is %s", policy);
+ g_debug ("default is %s", policy);
gpk_dbus_set_interaction_from_text (interact, &dbus->priv->timeout_tmp, policy);
}
g_free (policy);
/* now override with policy from client */
gpk_dbus_set_interaction_from_text (interact, &dbus->priv->timeout_tmp, interaction);
- egg_debug ("client is %s", interaction);
+ g_debug ("client is %s", interaction);
/* now override with enforced policy */
policy = g_settings_get_string (dbus->priv->settings, GPK_SETTINGS_DBUS_ENFORCED_INTERACTION);
if (policy != NULL) {
- egg_debug ("enforced is %s", policy);
+ g_debug ("enforced is %s", policy);
gpk_dbus_set_interaction_from_text (interact, &dbus->priv->timeout_tmp, policy);
}
g_free (policy);
@@ -343,7 +341,7 @@ gpk_dbus_create_task (GpkDbus *dbus, guint32 xid, const gchar *interaction, DBus
gpk_dbus_parse_interaction (dbus, interaction, &interact, &timeout);
/* set interaction mode */
- egg_debug ("interact=%i", (gint) interact);
+ g_debug ("interact=%i", (gint) interact);
gpk_dbus_task_set_interaction (task, interact);
/* set the parent window */
diff --git a/src/gpk-debug.c b/src/gpk-debug.c
new file mode 100644
index 0000000..1bd3223
--- /dev/null
+++ b/src/gpk-debug.c
@@ -0,0 +1,193 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2010 Richard Hughes <richard hughsie com>
+ *
+ * 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.
+ */
+
+#include <glib/gi18n.h>
+#include <unistd.h>
+#include <stdio.h>
+
+#include <gpk-debug.h>
+
+#include "config.h"
+
+static gboolean _verbose = FALSE;
+static gboolean _console = FALSE;
+
+/**
+ * gpk_debug_is_verbose:
+ *
+ * Returns: TRUE if we have debugging enabled
+ **/
+gboolean
+gpk_debug_is_verbose (void)
+{
+ /* local first */
+ if (_verbose)
+ return TRUE;
+
+ /* fall back to env variable */
+ if (g_getenv ("VERBOSE") != NULL)
+ return TRUE;
+ return FALSE;
+}
+
+/**
+ * gpk_debug_ignore_cb:
+ **/
+static void
+gpk_debug_ignore_cb (const gchar *log_domain, GLogLevelFlags log_level,
+ const gchar *message, gpointer user_data)
+{
+}
+
+#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
+
+#define GPK_DEBUG_LOG_DOMAIN_LENGTH 20
+
+/**
+ * gpk_debug_handler_cb:
+ **/
+static void
+gpk_debug_handler_cb (const gchar *log_domain, GLogLevelFlags log_level,
+ const gchar *message, gpointer user_data)
+{
+ gchar str_time[255];
+ time_t the_time;
+ guint len;
+ guint i;
+
+ /* time header */
+ time (&the_time);
+ strftime (str_time, 254, "%H:%M:%S", localtime (&the_time));
+
+ /* no color please, we're British */
+ if (!_console) {
+ if (log_level == G_LOG_LEVEL_DEBUG) {
+ g_print ("%s\t%s\t%s\n", str_time, log_domain, message);
+ } else {
+ g_print ("***\n%s\t%s\t%s\n***\n", str_time, log_domain, message);
+ }
+ return;
+ }
+
+ /* time in green */
+ g_print ("%c[%dm%s\t", 0x1B, CONSOLE_GREEN, str_time);
+
+ /* log domain in either blue */
+ if (g_strcmp0 (log_domain, G_LOG_DOMAIN) == 0)
+ g_print ("%c[%dm%s%c[%dm", 0x1B, CONSOLE_BLUE, log_domain, 0x1B, CONSOLE_RESET);
+ else
+ g_print ("%c[%dm%s%c[%dm", 0x1B, CONSOLE_CYAN, log_domain, 0x1B, CONSOLE_RESET);
+
+ /* pad with spaces */
+ len = strlen (log_domain);
+ for (i=len; i<GPK_DEBUG_LOG_DOMAIN_LENGTH; i++)
+ g_print (" ");
+
+ /* critical is also in red */
+ if (log_level == G_LOG_LEVEL_CRITICAL ||
+ log_level == G_LOG_LEVEL_ERROR) {
+ g_print ("%c[%dm%s\n%c[%dm", 0x1B, CONSOLE_RED, message, 0x1B, CONSOLE_RESET);
+ } else {
+ /* debug in blue */
+ g_print ("%c[%dm%s\n%c[%dm", 0x1B, CONSOLE_BLUE, message, 0x1B, CONSOLE_RESET);
+ }
+}
+
+/**
+ * gpk_debug_pre_parse_hook:
+ */
+static gboolean
+gpk_debug_pre_parse_hook (GOptionContext *context, GOptionGroup *group, gpointer data, GError **error)
+{
+ const GOptionEntry main_entries[] = {
+ { "verbose", 'v', 0, G_OPTION_ARG_NONE, &_verbose,
+ /* TRANSLATORS: turn on all debugging */
+ N_("Show debugging information for all files"), NULL },
+ { NULL}
+ };
+
+ /* add main entry */
+ g_option_context_add_main_entries (context, main_entries, NULL);
+ return TRUE;
+}
+
+/**
+ * gpk_debug_add_log_domain:
+ */
+void
+gpk_debug_add_log_domain (const gchar *log_domain)
+{
+ if (_verbose) {
+ g_log_set_fatal_mask (log_domain, G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL);
+ g_log_set_handler (log_domain,
+ G_LOG_LEVEL_ERROR |
+ G_LOG_LEVEL_CRITICAL |
+ G_LOG_LEVEL_DEBUG |
+ G_LOG_LEVEL_WARNING,
+ gpk_debug_handler_cb, NULL);
+ } else {
+ /* hide all debugging */
+ g_log_set_handler (log_domain,
+ G_LOG_LEVEL_DEBUG | G_LOG_LEVEL_WARNING,
+ gpk_debug_ignore_cb, NULL);
+ }
+}
+
+/**
+ * gpk_debug_post_parse_hook:
+ */
+static gboolean
+gpk_debug_post_parse_hook (GOptionContext *context, GOptionGroup *group, gpointer data, GError **error)
+{
+ /* verbose? */
+ gpk_debug_add_log_domain (G_LOG_DOMAIN);
+ _console = (isatty (fileno (stdout)) == 1);
+ g_debug ("Verbose debugging %s (on console %i)", _verbose ? "enabled" : "disabled", _console);
+ return TRUE;
+}
+
+/**
+ * gpk_debug_get_option_group:
+ *
+ * Returns a #GOptionGroup for the commandline arguments recognized
+ * by debugging. You should add this group to your #GOptionContext
+ * with g_option_context_add_group(), if you are using
+ * g_option_context_parse() to parse your commandline arguments.
+ *
+ * Returns: a #GOptionGroup for the commandline arguments
+ */
+GOptionGroup *
+gpk_debug_get_option_group (void)
+{
+ GOptionGroup *group;
+ group = g_option_group_new ("debug", _("Debugging Options"), _("Show debugging options"), NULL, NULL);
+ g_option_group_set_parse_hooks (group, gpk_debug_pre_parse_hook, gpk_debug_post_parse_hook);
+ return group;
+}
+
diff --git a/src/gpk-debug.h b/src/gpk-debug.h
new file mode 100644
index 0000000..40d3474
--- /dev/null
+++ b/src/gpk-debug.h
@@ -0,0 +1,31 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2010 Richard Hughes <richard hughsie com>
+ *
+ * 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 __GPK_DEBUG_H__
+#define __GPK_DEBUG_H__
+
+#include <glib.h>
+
+gboolean gpk_debug_is_verbose (void);
+GOptionGroup *gpk_debug_get_option_group (void);
+void gpk_debug_add_log_domain (const gchar *log_domain);
+
+#endif /* __GPK_DEBUG_H__ */
diff --git a/src/gpk-desktop.c b/src/gpk-desktop.c
index 16d815f..b070d6d 100644
--- a/src/gpk-desktop.c
+++ b/src/gpk-desktop.c
@@ -31,7 +31,6 @@
#define GMENU_I_KNOW_THIS_IS_UNSTABLE
#include <gnome-menus/gmenu-tree.h>
-#include "egg-debug.h"
#include "egg-string.h"
#include "gpk-desktop.h"
@@ -86,17 +85,17 @@ gpk_desktop_get_menu_path_submenu (const gchar *filename, const gchar *menu_file
tree = gmenu_tree_lookup (menu_file, GMENU_TREE_FLAGS_INCLUDE_EXCLUDED);
if (tree == NULL) {
- egg_warning ("no tree for %s", menu_file);
+ g_warning ("no tree for %s", menu_file);
goto out;
}
directory = gmenu_tree_get_root_directory (tree);
if (directory == NULL) {
- egg_warning ("no directory for %s", menu_file);
+ g_warning ("no directory for %s", menu_file);
goto out;
}
text = gpk_desktop_directory_get_menu_path (directory, filename);
if (text == NULL) {
- egg_debug ("no path for %s", filename);
+ g_debug ("no path for %s", filename);
goto out;
}
path = g_strdup_printf ("%s \342\236\231 %s", label, text);
@@ -158,7 +157,7 @@ gpk_desktop_check_icon_valid (const gchar *icon)
/* default to 32x32 */
icon_info = gtk_icon_theme_lookup_icon (icon_theme, icon, 32, GTK_ICON_LOOKUP_USE_BUILTIN);
if (icon_info == NULL) {
- egg_debug ("ignoring broken icon %s", icon);
+ g_debug ("ignoring broken icon %s", icon);
ret = FALSE;
} else {
/* we only used this to see if it was valid */
@@ -188,7 +187,7 @@ gpk_desktop_get_file_weight (const gchar *filename)
file = g_key_file_new ();
ret = g_key_file_load_from_file (file, filename, G_KEY_FILE_KEEP_TRANSLATIONS, NULL);
if (!ret) {
- egg_debug ("failed to open %s", filename);
+ g_debug ("failed to open %s", filename);
weight = G_MININT;
goto out;
}
@@ -256,7 +255,7 @@ gpk_desktop_guess_best_file (PkDesktop *desktop, const gchar *package)
for (i=0; i<array->len; i++) {
filename = g_ptr_array_index (array, i);
weight = gpk_desktop_get_file_weight (filename);
- egg_debug ("file %s has weight %i", filename, weight);
+ g_debug ("file %s has weight %i", filename, weight);
if (weight > max) {
max = weight;
max_index = i;
@@ -269,7 +268,7 @@ gpk_desktop_guess_best_file (PkDesktop *desktop, const gchar *package)
/* we've got a best */
best_file = g_strdup (g_ptr_array_index (array, max_index));
- egg_debug ("using %s", best_file);
+ g_debug ("using %s", best_file);
out:
if (array != NULL)
g_ptr_array_unref (array);
@@ -295,7 +294,7 @@ gpk_desktop_guess_icon_name (PkDesktop *desktop, const gchar *package)
file = g_key_file_new ();
ret = g_key_file_load_from_file (file, filename, G_KEY_FILE_NONE, NULL);
if (!ret) {
- egg_warning ("failed to open %s", filename);
+ g_warning ("failed to open %s", filename);
goto out;
}
data = g_key_file_get_string (file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_ICON, NULL);
@@ -330,7 +329,7 @@ gpk_desktop_guess_localised_name (PkDesktop *desktop, const gchar *package)
file = g_key_file_new ();
ret = g_key_file_load_from_file (file, filename, G_KEY_FILE_KEEP_TRANSLATIONS, NULL);
if (!ret) {
- egg_warning ("failed to open %s", filename);
+ g_warning ("failed to open %s", filename);
goto out;
}
data = g_key_file_get_string (file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_NAME, NULL);
diff --git a/src/gpk-dialog.c b/src/gpk-dialog.c
index f151edf..6425f58 100644
--- a/src/gpk-dialog.c
+++ b/src/gpk-dialog.c
@@ -26,7 +26,6 @@
#include <gtk/gtk.h>
#include <packagekit-glib2/packagekit.h>
-#include "egg-debug.h"
#include "egg-string.h"
#include "gpk-common.h"
@@ -59,7 +58,7 @@ gpk_dialog_package_id_name_join_locale (gchar **package_ids)
for (i=0; i<length; i++) {
split = pk_package_id_split (package_ids[i]);
if (split == NULL) {
- egg_warning ("failed to split %s", package_ids[i]);
+ g_warning ("failed to split %s", package_ids[i]);
continue;
}
g_ptr_array_add (array, g_strdup (split[0]));
@@ -284,7 +283,7 @@ gpk_client_checkbutton_show_depends_cb (GtkWidget *widget, const gchar *key)
/* set the policy */
checked = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
- egg_debug ("Changing %s to %i", key, checked);
+ g_debug ("Changing %s to %i", key, checked);
settings = g_settings_new (GPK_SETTINGS_SCHEMA);
g_settings_set_boolean (settings, key, !checked);
g_object_unref (settings);
diff --git a/src/gpk-enum.c b/src/gpk-enum.c
index 4bbb639..8c8b612 100644
--- a/src/gpk-enum.c
+++ b/src/gpk-enum.c
@@ -25,7 +25,6 @@
#include <glib/gi18n.h>
#include <packagekit-glib2/packagekit.h>
-#include "egg-debug.h"
#include "egg-string.h"
#include "gpk-enum.h"
@@ -287,7 +286,7 @@ gpk_media_type_enum_to_localised_text (PkMediaTypeEnum type)
text = _("media");
break;
default:
- egg_warning ("Unknown media type");
+ g_warning ("Unknown media type");
}
return text;
}
@@ -493,7 +492,7 @@ gpk_error_enum_to_localised_text (PkErrorEnum code)
text = _("Install root is invalid");
break;
default:
- egg_warning ("Unknown error");
+ g_warning ("Unknown error");
}
return text;
}
@@ -738,7 +737,7 @@ gpk_error_enum_to_localised_message (PkErrorEnum code)
text = _("The install root is invalid. Please contact your administrator.");
break;
default:
- egg_warning ("Unknown error, please report a bug at " GPK_BUGZILLA_URL ".\n"
+ g_warning ("Unknown error, please report a bug at " GPK_BUGZILLA_URL ".\n"
"More information is available in the detailed report.");
}
return text;
@@ -771,7 +770,7 @@ gpk_restart_enum_to_localised_text_future (PkRestartEnum restart)
text = _("A restart will be required due to a security update.");
break;
default:
- egg_warning ("restart unrecognised: %i", restart);
+ g_warning ("restart unrecognised: %i", restart);
}
return text;
}
@@ -803,7 +802,7 @@ gpk_restart_enum_to_localised_text (PkRestartEnum restart)
text = _("A restart is required to remain secure.");
break;
default:
- egg_warning ("restart unrecognised: %i", restart);
+ g_warning ("restart unrecognised: %i", restart);
}
return text;
}
@@ -829,7 +828,7 @@ gpk_update_state_enum_to_localised_text (PkUpdateStateEnum state)
text = _("Testing");
break;
default:
- egg_warning ("state unrecognised: %i", state);
+ g_warning ("state unrecognised: %i", state);
}
return text;
}
@@ -891,7 +890,7 @@ gpk_message_enum_to_localised_text (PkMessageEnum message)
text = _("Other updates have been held back");
break;
default:
- egg_warning ("message unrecognised: %i", message);
+ g_warning ("message unrecognised: %i", message);
}
return text;
}
@@ -1053,7 +1052,7 @@ gpk_status_enum_to_localised_text (PkStatusEnum status)
text = _("Copying files");
break;
default:
- egg_warning ("status unrecognised: %s", pk_status_enum_to_text (status));
+ g_warning ("status unrecognised: %s", pk_status_enum_to_text (status));
}
return text;
}
@@ -1095,7 +1094,7 @@ gpk_update_enum_to_localised_text (PkInfoEnum info, guint number)
text = g_strdup_printf (ngettext ("%i blocked update", "%i blocked updates", number), number);
break;
default:
- egg_warning ("update info unrecognised: %s", pk_info_enum_to_text (info));
+ g_warning ("update info unrecognised: %s", pk_info_enum_to_text (info));
}
return text;
}
@@ -1147,7 +1146,7 @@ gpk_info_enum_to_localised_text (PkInfoEnum info)
text = _("Available");
break;
default:
- egg_warning ("info unrecognised: %s", pk_info_enum_to_text (info));
+ g_warning ("info unrecognised: %s", pk_info_enum_to_text (info));
}
return text;
}
@@ -1197,7 +1196,7 @@ gpk_info_enum_to_localised_present (PkInfoEnum info)
text = _("Decompressing");
break;
default:
- egg_warning ("info unrecognised: %s", pk_info_enum_to_text (info));
+ g_warning ("info unrecognised: %s", pk_info_enum_to_text (info));
}
return text;
}
@@ -1247,7 +1246,7 @@ gpk_info_enum_to_localised_past (PkInfoEnum info)
text = _("Decompressed");
break;
default:
- egg_warning ("info unrecognised: %s", pk_info_enum_to_text (info));
+ g_warning ("info unrecognised: %s", pk_info_enum_to_text (info));
}
return text;
}
@@ -1401,7 +1400,7 @@ gpk_role_enum_to_localised_present (PkRoleEnum role)
text = _("Simulating the update");
break;
default:
- egg_warning ("role unrecognised: %s", pk_role_enum_to_text (role));
+ g_warning ("role unrecognised: %s", pk_role_enum_to_text (role));
}
return text;
}
@@ -1557,7 +1556,7 @@ gpk_role_enum_to_localised_past (PkRoleEnum role)
text = _("Simulated the update");
break;
default:
- egg_warning ("role unrecognised: %s", pk_role_enum_to_text (role));
+ g_warning ("role unrecognised: %s", pk_role_enum_to_text (role));
}
return text;
}
@@ -1711,7 +1710,7 @@ gpk_group_enum_to_localised_text (PkGroupEnum group)
text = _("Unknown group");
break;
default:
- egg_warning ("group unrecognised: %i", group);
+ g_warning ("group unrecognised: %i", group);
}
return text;
}
diff --git a/src/gpk-error.c b/src/gpk-error.c
index e53ec03..af4f909 100644
--- a/src/gpk-error.c
+++ b/src/gpk-error.c
@@ -28,8 +28,6 @@
#include <gtk/gtk.h>
#include <packagekit-glib2/packagekit.h>
-#include "egg-debug.h"
-
#include "gpk-common.h"
#include "gpk-error.h"
@@ -75,7 +73,7 @@ gpk_error_dialog_modal_with_time (GtkWindow *window, const gchar *title, const g
builder = gtk_builder_new ();
retval = gtk_builder_add_from_file (builder, GPK_DATA "/gpk-error.ui", &error);
if (retval == 0) {
- egg_warning ("failed to load ui: %s", error->message);
+ g_warning ("failed to load ui: %s", error->message);
g_error_free (error);
goto out_build;
}
diff --git a/src/gpk-firmware.c b/src/gpk-firmware.c
index cb2bb90..960afa2 100644
--- a/src/gpk-firmware.c
+++ b/src/gpk-firmware.c
@@ -42,7 +42,6 @@
#include <gudev/gudev.h>
#endif
-#include "egg-debug.h"
#include "egg-string.h"
#include "egg-console-kit.h"
@@ -137,7 +136,7 @@ gpk_firmware_request_new (const gchar *filename, const gchar *sysfs_path)
} else if (g_strcmp0 (subsystem, "pci") == 0) {
req->subsystem = GPK_FIRMWARE_SUBSYSTEM_PCI;
} else {
- egg_warning ("subsystem unrecognised: %s", subsystem);
+ g_warning ("subsystem unrecognised: %s", subsystem);
}
/* get model, so we can show something sensible */
@@ -172,7 +171,6 @@ gpk_firmware_request_free (GpkFirmwareRequest *req)
g_free (req);
}
-
/**
* gpk_firmware_rebind:
**/
@@ -207,14 +205,14 @@ gpk_firmware_rebind (GpkFirmware *firmware)
command = g_strdup_printf ("pkexec %s %s", GPK_FIRMWARE_DEVICE_REBIND_PROGRAM, string->str);
ret = g_spawn_command_line_sync (command, &rebind_stdout, &rebind_stderr, &exit_status, &error);
if (!ret) {
- egg_warning ("failed to spawn '%s': %s", command, error->message);
+ g_warning ("failed to spawn '%s': %s", command, error->message);
g_error_free (error);
goto out;
}
/* if we failed to rebind the device */
if (exit_status != 0) {
- egg_warning ("failed to rebind: %s, %s", rebind_stdout, rebind_stderr);
+ g_warning ("failed to rebind: %s, %s", rebind_stdout, rebind_stderr);
ret = FALSE;
goto out;
}
@@ -243,11 +241,11 @@ gpk_firmware_libnotify_cb (NotifyNotification *notification, gchar *action, gpoi
} else if (g_strcmp0 (action, "restart-now") == 0) {
ret = egg_console_kit_restart (firmware->priv->consolekit, &error);
if (!ret) {
- egg_warning ("failed to reset: %s", error->message);
+ g_warning ("failed to reset: %s", error->message);
g_error_free (error);
}
} else {
- egg_warning ("unknown action id: %s", action);
+ g_warning ("unknown action id: %s", action);
}
}
@@ -282,7 +280,7 @@ gpk_firmware_require_restart (GpkFirmware *firmware)
/* show the bubble */
ret = notify_notification_show (notification, &error);
if (!ret) {
- egg_warning ("error: %s", error->message);
+ g_warning ("error: %s", error->message);
g_error_free (error);
}
}
@@ -309,7 +307,7 @@ gpk_firmware_require_replug (GpkFirmware *firmware)
/* show the bubble */
ret = notify_notification_show (notification, &error);
if (!ret) {
- egg_warning ("error: %s", error->message);
+ g_warning ("error: %s", error->message);
g_error_free (error);
}
}
@@ -336,7 +334,7 @@ gpk_firmware_require_nothing (GpkFirmware *firmware)
/* show the bubble */
ret = notify_notification_show (notification, &error);
if (!ret) {
- egg_warning ("error: %s", error->message);
+ g_warning ("error: %s", error->message);
g_error_free (error);
}
}
@@ -360,7 +358,7 @@ gpk_firmware_install_packages_cb (GObject *object, GAsyncResult *res, GpkFirmwar
/* get the results */
results = pk_client_generic_finish (client, res, &error);
if (results == NULL) {
- egg_warning ("failed to install file: %s", error->message);
+ g_warning ("failed to install file: %s", error->message);
g_error_free (error);
goto out;
}
@@ -368,7 +366,7 @@ gpk_firmware_install_packages_cb (GObject *object, GAsyncResult *res, GpkFirmwar
/* check error code */
error_code = pk_results_get_error_code (results);
if (error_code != NULL) {
- egg_warning ("failed to install file: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ g_warning ("failed to install file: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
/* ignore some errors */
if (pk_error_get_code (error_code) != PK_ERROR_ENUM_PROCESS_KILL &&
@@ -494,7 +492,7 @@ gpk_firmware_check_available (GpkFirmware *firmware, const gchar *filename)
values = g_strsplit (filename, "&", -1);
results = pk_client_search_files (PK_CLIENT(firmware->priv->task), filter, values, NULL, NULL, NULL, &error);
if (results == NULL) {
- egg_warning ("failed to search file %s: %s", filename, error->message);
+ g_warning ("failed to search file %s: %s", filename, error->message);
g_error_free (error);
goto out;
}
@@ -502,16 +500,16 @@ gpk_firmware_check_available (GpkFirmware *firmware, const gchar *filename)
/* check error code */
error_code = pk_results_get_error_code (results);
if (error_code != NULL) {
- egg_warning ("failed to search file: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ g_warning ("failed to search file: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
goto out;
}
/* make sure we have one package */
array = pk_results_get_package_array (results);
if (array->len == 0)
- egg_debug ("no package providing %s found", filename);
+ g_debug ("no package providing %s found", filename);
else if (array->len != 1)
- egg_warning ("not one package providing %s found (%i)", filename, length);
+ g_warning ("not one package providing %s found (%i)", filename, length);
else
item = g_object_ref (g_ptr_array_index (array, 0));
out:
@@ -580,7 +578,7 @@ gpk_firmware_timeout_cb (gpointer data)
/* nothing to do */
if (firmware->priv->packages_found->len == 0) {
- egg_debug ("no packages providing any of the missing firmware");
+ g_debug ("no packages providing any of the missing firmware");
goto out;
}
@@ -622,7 +620,7 @@ gpk_firmware_timeout_cb (gpointer data)
_("Ignore devices"), gpk_firmware_libnotify_cb, firmware, NULL);
ret = notify_notification_show (notification, &error);
if (!ret) {
- egg_warning ("error: %s", error->message);
+ g_warning ("error: %s", error->message);
g_error_free (error);
}
@@ -647,13 +645,13 @@ gpk_firmware_remove_banned (GpkFirmware *firmware, GPtrArray *array)
/* get from settings */
banned_str = g_settings_get_string (firmware->priv->settings, GPK_SETTINGS_BANNED_FIRMWARE);
if (banned_str == NULL) {
- egg_warning ("could not read banned list");
+ g_warning ("could not read banned list");
goto out;
}
/* nothing in list, common case */
if (egg_strzero (banned_str)) {
- egg_debug ("nothing in banned list");
+ g_debug ("nothing in banned list");
goto out;
}
@@ -666,7 +664,7 @@ gpk_firmware_remove_banned (GpkFirmware *firmware, GPtrArray *array)
for (j=0; banned[j] != NULL; j++) {
ret = g_pattern_match_simple (banned[j], req->filename);
if (ret) {
- egg_debug ("match %s for %s, removing", banned[j], req->filename);
+ g_debug ("match %s for %s, removing", banned[j], req->filename);
gpk_firmware_request_free (req);
g_ptr_array_remove_index_fast (array, i);
break;
@@ -693,13 +691,13 @@ gpk_firmware_remove_ignored (GpkFirmware *firmware, GPtrArray *array)
/* get from settings */
ignored_str = g_settings_get_string (firmware->priv->settings, GPK_SETTINGS_IGNORED_DEVICES);
if (ignored_str == NULL) {
- egg_warning ("could not read ignored list");
+ g_warning ("could not read ignored list");
goto out;
}
/* nothing in list, common case */
if (egg_strzero (ignored_str)) {
- egg_debug ("nothing in ignored list");
+ g_debug ("nothing in ignored list");
goto out;
}
@@ -712,7 +710,7 @@ gpk_firmware_remove_ignored (GpkFirmware *firmware, GPtrArray *array)
for (j=0; ignored[j] != NULL; j++) {
ret = g_pattern_match_simple (ignored[j], req->id);
if (ret) {
- egg_debug ("match %s for %s, removing", ignored[j], req->id);
+ g_debug ("match %s for %s, removing", ignored[j], req->id);
gpk_firmware_request_free (req);
g_ptr_array_remove_index_fast (array, i);
break;
@@ -771,7 +769,7 @@ gpk_firmware_get_device (GpkFirmware *firmware, const gchar *filename)
file = g_file_new_for_path (filename);
info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET, G_FILE_QUERY_INFO_NONE, NULL, &error);
if (info == NULL) {
- egg_warning ("Failed to get symlink: %s", error->message);
+ g_warning ("Failed to get symlink: %s", error->message);
g_error_free (error);
goto out;
}
@@ -779,7 +777,7 @@ gpk_firmware_get_device (GpkFirmware *firmware, const gchar *filename)
/* /devices/pci0000:00/0000:00:1d.0/usb5/5-2/firmware/5-2 */
symlink_path = g_file_info_get_symlink_target (info);
if (symlink_path == NULL) {
- egg_warning ("failed to get symlink target");
+ g_warning ("failed to get symlink target");
goto out;
}
@@ -794,7 +792,7 @@ gpk_firmware_get_device (GpkFirmware *firmware, const gchar *filename)
for (i=len; i>1; i--) {
split[i] = NULL;
target = g_strjoinv ("/", split);
- egg_debug ("testing %s", target);
+ g_debug ("testing %s", target);
if (g_file_test (target, G_FILE_TEST_EXISTS))
goto out;
g_free (target);
@@ -835,7 +833,7 @@ gpk_firmware_add_file (GpkFirmware *firmware, const gchar *filename_no_path)
/* this is the file that udev created for us */
missing_path = g_build_filename (GPK_FIRMWARE_MISSING_DIR, filename_no_path, NULL);
- egg_debug ("filename=%s -> %s", missing_path, filename_path);
+ g_debug ("filename=%s -> %s", missing_path, filename_path);
/* get symlink target */
sysfs_path = gpk_firmware_get_device (firmware, missing_path);
@@ -847,11 +845,11 @@ gpk_firmware_add_file (GpkFirmware *firmware, const gchar *filename_no_path)
for (i=0; i<array->len; i++) {
req = g_ptr_array_index (array, i);
if (g_strcmp0 (sysfs_path, req->sysfs_path) == 0) {
- egg_debug ("ignoring previous sysfs request for %s", sysfs_path);
+ g_debug ("ignoring previous sysfs request for %s", sysfs_path);
goto out;
}
if (g_strcmp0 (filename_path, req->filename) == 0) {
- egg_debug ("ignoring previous filename request for %s", filename_path);
+ g_debug ("ignoring previous filename request for %s", filename_path);
goto out;
}
}
@@ -884,14 +882,14 @@ gpk_firmware_scan_directory (GpkFirmware *firmware)
/* should we check and show the user */
ret = g_settings_get_boolean (firmware->priv->settings, GPK_SETTINGS_ENABLE_CHECK_FIRMWARE);
if (!ret) {
- egg_debug ("not showing thanks to GSettings");
+ g_debug ("not showing thanks to GSettings");
return;
}
/* open the directory of requests */
dir = g_dir_open (GPK_FIRMWARE_MISSING_DIR, 0, &error);
if (dir == NULL) {
- egg_warning ("failed to open directory: %s", error->message);
+ g_warning ("failed to open directory: %s", error->message);
g_error_free (error);
return;
}
@@ -913,7 +911,7 @@ gpk_firmware_scan_directory (GpkFirmware *firmware)
array = firmware->priv->array_requested;
for (i=0; i<array->len; i++) {
req = g_ptr_array_index (array, i);
- egg_debug ("requested: %s", req->filename);
+ g_debug ("requested: %s", req->filename);
}
/* remove banned files */
@@ -926,7 +924,7 @@ gpk_firmware_scan_directory (GpkFirmware *firmware)
array = firmware->priv->array_requested;
for (i=0; i<array->len; i++) {
req = g_ptr_array_index (array, i);
- egg_debug ("searching for: %s", req->filename);
+ g_debug ("searching for: %s", req->filename);
}
/* don't spam the user at startup, so wait a little delay */
@@ -955,7 +953,7 @@ gpk_firmware_monitor_changed_cb (GFileMonitor *monitor, GFile *file, GFile *othe
GFileMonitorEvent event_type, GpkFirmware *firmware)
{
if (firmware->priv->timeout_id > 0) {
- egg_debug ("clearing timeout as device changed");
+ g_debug ("clearing timeout as device changed");
g_source_remove (firmware->priv->timeout_id);
}
@@ -1002,7 +1000,7 @@ gpk_firmware_init (GpkFirmware *firmware)
file = g_file_new_for_path (GPK_FIRMWARE_MISSING_DIR);
firmware->priv->monitor = g_file_monitor (file, G_FILE_MONITOR_NONE, NULL, &error);
if (firmware->priv->monitor == NULL) {
- egg_warning ("failed to setup monitor: %s", error->message);
+ g_warning ("failed to setup monitor: %s", error->message);
g_error_free (error);
goto out;
}
diff --git a/src/gpk-gnome.c b/src/gpk-gnome.c
index a136a78..cf3e282 100644
--- a/src/gpk-gnome.c
+++ b/src/gpk-gnome.c
@@ -25,7 +25,6 @@
#include <gtk/gtk.h>
#include <string.h>
-#include "egg-debug.h"
#include "gpk-gnome.h"
/**
@@ -43,7 +42,7 @@ gpk_gnome_open (const gchar *url)
ret = gtk_show_uri (NULL, url, GDK_CURRENT_TIME, &error);
if (!ret) {
- egg_warning ("spawn of '%s' failed", url);
+ g_warning ("spawn of '%s' failed", url);
g_error_free (error);
}
return ret;
@@ -64,7 +63,7 @@ gpk_gnome_help (const gchar *link_id)
uri = g_strconcat ("ghelp:gnome-packagekit?", link_id, NULL);
else
uri = g_strdup ("ghelp:gnome-packagekit");
- egg_debug ("opening uri %s", uri);
+ g_debug ("opening uri %s", uri);
gtk_show_uri (NULL, uri, GDK_CURRENT_TIME, &error);
diff --git a/src/gpk-hardware.c b/src/gpk-hardware.c
index 5c80737..206cd9a 100644
--- a/src/gpk-hardware.c
+++ b/src/gpk-hardware.c
@@ -40,7 +40,6 @@
#include <dbus/dbus.h>
#include <packagekit-glib2/packagekit.h>
-#include "egg-debug.h"
#include "egg-string.h"
#include "gpk-common.h"
@@ -81,7 +80,7 @@ gpk_hardware_install_packages_cb (GObject *object, GAsyncResult *res, GpkHardwar
/* get the results */
results = pk_client_generic_finish (client, res, &error);
if (results == NULL) {
- egg_warning ("failed to install file: %s", error->message);
+ g_warning ("failed to install file: %s", error->message);
g_error_free (error);
goto out;
}
@@ -89,7 +88,7 @@ gpk_hardware_install_packages_cb (GObject *object, GAsyncResult *res, GpkHardwar
/* check error code */
error_code = pk_results_get_error_code (results);
if (error_code != NULL) {
- egg_warning ("failed to install file: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ g_warning ("failed to install file: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
goto out;
}
out:
@@ -111,10 +110,10 @@ gpk_hardware_libnotify_cb (NotifyNotification *notification, gchar *action, gpoi
pk_client_install_packages_async (PK_CLIENT(hardware->priv->task), TRUE, hardware->priv->package_ids, NULL, NULL, NULL,
(GAsyncReadyCallback) gpk_hardware_install_packages_cb, hardware);
} else if (g_strcmp0 (action, GPK_HARDWARE_DONT_PROMPT_ACTION) == 0) {
- egg_debug ("set %s to FALSE", GPK_SETTINGS_ENABLE_CHECK_HARDWARE);
+ g_debug ("set %s to FALSE", GPK_SETTINGS_ENABLE_CHECK_HARDWARE);
g_settings_set_boolean (hardware->priv->settings, GPK_SETTINGS_ENABLE_CHECK_HARDWARE, FALSE);
} else {
- egg_warning ("unknown action id: %s", action);
+ g_warning ("unknown action id: %s", action);
}
}
@@ -141,7 +140,7 @@ gpk_hardware_what_provides_cb (GObject *object, GAsyncResult *res, GpkHardware *
/* get the results */
results = pk_client_generic_finish (client, res, &error);
if (results == NULL) {
- egg_warning ("failed to get provides: %s", error->message);
+ g_warning ("failed to get provides: %s", error->message);
g_error_free (error);
goto out;
}
@@ -149,14 +148,14 @@ gpk_hardware_what_provides_cb (GObject *object, GAsyncResult *res, GpkHardware *
/* check error code */
error_code = pk_results_get_error_code (results);
if (error_code != NULL) {
- egg_warning ("failed to get provides: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ g_warning ("failed to get provides: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
goto out;
}
/* If there are no driver packages available just return */
array = pk_results_get_package_array (results);
if (array->len == 0) {
- egg_debug ("no drivers available");
+ g_debug ("no drivers available");
goto out;
}
@@ -192,7 +191,7 @@ gpk_hardware_what_provides_cb (GObject *object, GAsyncResult *res, GpkHardware *
_("Do not show this again"), gpk_hardware_libnotify_cb, hardware, NULL);
ret = notify_notification_show (notification, &error);
if (!ret) {
- egg_warning ("error: %s", error->message);
+ g_warning ("error: %s", error->message);
g_error_free (error);
}
out:
@@ -227,7 +226,7 @@ static gboolean
gpk_hardware_device_added_timeout (gpointer data)
{
GpkHardware *hardware = GPK_HARDWARE (data);
- egg_debug ("multiple signal timeout callback");
+ g_debug ("multiple signal timeout callback");
gpk_hardware_check_for_driver_available (hardware, hardware->priv->udi);
g_free (hardware->priv->udi);
@@ -243,7 +242,7 @@ gpk_hardware_device_added_cb (DBusGProxy *proxy, const gchar *udi, GpkHardware *
{
guint added_id;
- egg_debug ("hardware added. udi=%s", udi);
+ g_debug ("hardware added. udi=%s", udi);
/* we get multiple hal signals for one device plugin. Ignore all but first one.
TODO: should we act on a different one ?
*/
@@ -262,7 +261,7 @@ gpk_hardware_device_added_cb (DBusGProxy *proxy, const gchar *udi, GpkHardware *
static gboolean
gpk_hardware_timeout_cb (gpointer data)
{
- egg_debug ("hardware timout callback");
+ g_debug ("hardware timout callback");
/* TODO: need to coldplug for any hardware without drivers */
gpk_hardware_check_for_driver_available (GPK_HARDWARE (data), "unavailable");
return FALSE;
@@ -287,7 +286,7 @@ gpk_hardware_init (GpkHardware *hardware)
/* should we check and show the user */
ret = g_settings_get_boolean (hardware->priv->settings, GPK_SETTINGS_ENABLE_CHECK_HARDWARE);
if (!ret) {
- egg_debug ("hardware driver checking disabled in GSettings");
+ g_debug ("hardware driver checking disabled in GSettings");
return;
}
hardware->priv->task = PK_TASK(gpk_task_new ());
@@ -297,7 +296,7 @@ gpk_hardware_init (GpkHardware *hardware)
hardware->priv->connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
if (error != NULL) {
- egg_warning ("Cannot connect to bus: %s", error->message);
+ g_warning ("Cannot connect to bus: %s", error->message);
g_error_free (error);
return;
}
diff --git a/src/gpk-helper-chooser.c b/src/gpk-helper-chooser.c
index 5989b0a..38dc956 100644
--- a/src/gpk-helper-chooser.c
+++ b/src/gpk-helper-chooser.c
@@ -32,8 +32,6 @@
#include "gpk-enum.h"
#include "gpk-desktop.h"
-#include "egg-debug.h"
-
static void gpk_helper_chooser_finalize (GObject *object);
#define GPK_HELPER_CHOOSER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GPK_TYPE_HELPER_CHOOSER, GpkHelperChooserPrivate))
@@ -120,9 +118,9 @@ gpk_helper_chooser_treeview_clicked_cb (GtkTreeSelection *selection, GpkHelperCh
gtk_tree_model_get (model, &iter, GPK_CHOOSER_COLUMN_ID, &helper->priv->package_id, -1);
/* show package_id */
- egg_debug ("selected row is: %s", helper->priv->package_id);
+ g_debug ("selected row is: %s", helper->priv->package_id);
} else {
- egg_debug ("no row selected");
+ g_debug ("no row selected");
}
}
@@ -183,7 +181,7 @@ gpk_helper_chooser_show (GpkHelperChooser *helper, GPtrArray *list)
"package-id", &package_id,
"summary", &summary,
NULL);
- egg_debug ("package '%s' got:", package_id);
+ g_debug ("package '%s' got:", package_id);
/* put formatted text into treeview */
gtk_list_store_append (helper->priv->list_store, &iter);
@@ -272,7 +270,7 @@ gpk_helper_chooser_init (GpkHelperChooser *helper)
helper->priv->builder = gtk_builder_new ();
retval = gtk_builder_add_from_file (helper->priv->builder, GPK_DATA "/gpk-log.ui", &error);
if (retval == 0) {
- egg_warning ("failed to load ui: %s", error->message);
+ g_warning ("failed to load ui: %s", error->message);
g_error_free (error);
}
diff --git a/src/gpk-helper-run.c b/src/gpk-helper-run.c
index 9eda7d8..b28d126 100644
--- a/src/gpk-helper-run.c
+++ b/src/gpk-helper-run.c
@@ -33,8 +33,6 @@
#include "gpk-desktop.h"
#include "gpk-enum.h"
-#include "egg-debug.h"
-
static void gpk_helper_run_finalize (GObject *object);
#define GPK_HELPER_RUN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GPK_TYPE_HELPER_RUN, GpkHelperRunPrivate))
@@ -67,7 +65,7 @@ gpk_helper_run_path (GpkHelperRun *helper, const gchar *filename)
/* check have value */
if (filename == NULL) {
- egg_warning ("no full path");
+ g_warning ("no full path");
goto out;
}
@@ -78,7 +76,7 @@ gpk_helper_run_path (GpkHelperRun *helper, const gchar *filename)
// context = (GAppLaunchContext*)gdk_app_launch_context_new ();
ret = g_app_info_launch (app, NULL, context, &error);
if (!ret) {
- egg_warning ("failed to launch: %s", error->message);
+ g_warning ("failed to launch: %s", error->message);
g_error_free (error);
}
out:
@@ -107,7 +105,7 @@ gpk_helper_run_button_run_cb (GtkWidget *widget, GpkHelperRun *helper)
selection = gtk_tree_view_get_selection (treeview);
ret = gtk_tree_selection_get_selected (selection, &model, &iter);
if (!ret) {
- egg_warning ("failed to get selection");
+ g_warning ("failed to get selection");
return;
}
@@ -147,7 +145,6 @@ gpk_helper_run_delete_event_cb (GtkWidget *widget, GdkEvent *event, GpkHelperRun
return FALSE;
}
-
/**
* gpk_helper_run_treeview_clicked_cb:
**/
@@ -164,9 +161,9 @@ gpk_helper_run_treeview_clicked_cb (GtkTreeSelection *selection, GpkHelperRun *h
gtk_tree_model_get (model, &iter, GPK_CHOOSER_COLUMN_FILENAME, &filename, -1);
/* show full path */
- egg_debug ("selected row is: %s", filename);
+ g_debug ("selected row is: %s", filename);
} else {
- egg_debug ("no row selected");
+ g_debug ("no row selected");
}
g_free (filename);
}
@@ -187,7 +184,7 @@ gpk_helper_run_row_activated_cb (GtkTreeView *treeview, GtkTreePath *path,
model = gtk_tree_view_get_model (treeview);
ret = gtk_tree_model_get_iter (model, &iter, path);
if (!ret) {
- egg_warning ("failed to get selection");
+ g_warning ("failed to get selection");
return;
}
@@ -246,7 +243,7 @@ gpk_helper_run_add_desktop_file (GpkHelperRun *helper, const gchar *package_id,
/* get weight */
weight = gpk_desktop_get_file_weight (filename);
if (weight < 0) {
- egg_debug ("ignoring %s", filename);
+ g_debug ("ignoring %s", filename);
goto out;
}
@@ -254,14 +251,14 @@ gpk_helper_run_add_desktop_file (GpkHelperRun *helper, const gchar *package_id,
file = g_key_file_new ();
ret = g_key_file_load_from_file (file, filename, G_KEY_FILE_NONE, NULL);
if (!ret) {
- egg_debug ("failed to load %s", filename);
+ g_debug ("failed to load %s", filename);
goto out;
}
/* get hidden */
hidden = g_key_file_get_boolean (file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_HIDDEN, NULL);
if (hidden) {
- egg_debug ("hidden, so ignoring %s", filename);
+ g_debug ("hidden, so ignoring %s", filename);
ret = FALSE;
goto out;
}
@@ -269,7 +266,7 @@ gpk_helper_run_add_desktop_file (GpkHelperRun *helper, const gchar *package_id,
/* is WM? */
ret = !g_key_file_has_group (file, "Window Manager");
if (!ret) {
- egg_debug ("ignoring Window Manager");
+ g_debug ("ignoring Window Manager");
goto out;
}
@@ -357,7 +354,7 @@ gpk_helper_run_add_package_ids (GpkHelperRun *helper, gchar **package_ids)
desktop = pk_desktop_new ();
ret = pk_desktop_open_database (desktop, NULL);
if (!ret) {
- egg_debug ("failed to open desktop DB");
+ g_debug ("failed to open desktop DB");
goto out;
}
@@ -375,7 +372,7 @@ gpk_helper_run_add_package_ids (GpkHelperRun *helper, gchar **package_ids)
}
g_ptr_array_unref (array);
} else {
- egg_warning ("failed to get files for %s: %s", parts[0], error->message);
+ g_warning ("failed to get files for %s: %s", parts[0], error->message);
g_clear_error (&error);
}
g_strfreev (parts);
@@ -405,7 +402,7 @@ gpk_helper_run_show (GpkHelperRun *helper, gchar **package_ids)
/* add all the apps */
len = gpk_helper_run_add_package_ids (helper, package_ids);
if (len == 0) {
- egg_debug ("no executable file for %s", package_ids[0]);
+ g_debug ("no executable file for %s", package_ids[0]);
goto out;
}
@@ -469,7 +466,7 @@ gpk_helper_run_init (GpkHelperRun *helper)
helper->priv->builder = gtk_builder_new ();
retval = gtk_builder_add_from_file (helper->priv->builder, GPK_DATA "/gpk-log.ui", &error);
if (retval == 0) {
- egg_warning ("failed to load ui: %s", error->message);
+ g_warning ("failed to load ui: %s", error->message);
g_error_free (error);
}
diff --git a/src/gpk-inhibit.c b/src/gpk-inhibit.c
index 4759c94..c452a40 100644
--- a/src/gpk-inhibit.c
+++ b/src/gpk-inhibit.c
@@ -37,7 +37,6 @@
#include <dbus/dbus-glib.h>
#include <packagekit-glib2/packagekit.h>
-#include "egg-debug.h"
#include "gpk-inhibit.h"
#include "gpk-common.h"
@@ -81,13 +80,13 @@ gpk_inhibit_create (GpkInhibit *inhibit)
g_return_val_if_fail (PK_IS_INHIBIT (inhibit), FALSE);
if (inhibit->priv->proxy == NULL) {
- egg_debug ("no connection to gnome-session");
+ g_debug ("no connection to gnome-session");
return FALSE;
}
/* check we are not trying to do this twice... */
if (inhibit->priv->cookie != 0) {
- egg_debug ("cookie already set as %i", inhibit->priv->cookie);
+ g_debug ("cookie already set as %i", inhibit->priv->cookie);
return FALSE;
}
@@ -120,13 +119,13 @@ gpk_inhibit_remove (GpkInhibit *inhibit)
g_return_val_if_fail (PK_IS_INHIBIT (inhibit), FALSE);
if (inhibit->priv->proxy == NULL) {
- egg_debug ("no connection to gnome-session");
+ g_debug ("no connection to gnome-session");
return FALSE;
}
/* check we are not trying to do this twice... */
if (inhibit->priv->cookie == 0) {
- egg_debug ("cookie not already set");
+ g_debug ("cookie not already set");
return FALSE;
}
@@ -158,7 +157,7 @@ gpk_inhibit_init (GpkInhibit *inhibit)
/* connect to session bus */
connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
if (error != NULL) {
- egg_warning ("Cannot connect to session bus: %s", error->message);
+ g_warning ("Cannot connect to session bus: %s", error->message);
g_error_free (error);
return;
}
@@ -168,7 +167,7 @@ gpk_inhibit_init (GpkInhibit *inhibit)
GS_DBUS_SERVICE, GS_DBUS_PATH_INHIBIT,
GS_DBUS_INTERFACE_INHIBIT, &error);
if (error != NULL) {
- egg_warning ("Cannot connect to gnome-session: %s", error->message);
+ g_warning ("Cannot connect to gnome-session: %s", error->message);
g_error_free (error);
}
}
diff --git a/src/gpk-install-catalog.c b/src/gpk-install-catalog.c
index dca61e2..22ccb4d 100644
--- a/src/gpk-install-catalog.c
+++ b/src/gpk-install-catalog.c
@@ -28,11 +28,10 @@
#include <packagekit-glib2/packagekit.h>
#include <dbus/dbus-glib.h>
-#include "egg-debug.h"
-
#include "gpk-common.h"
#include "gpk-error.h"
#include "gpk-dbus.h"
+#include "gpk-debug.h"
/**
* main:
@@ -70,7 +69,7 @@ main (int argc, char *argv[])
context = g_option_context_new ("gpk-install-catalog");
g_option_context_set_summary (context, _("Catalog Installer"));
g_option_context_add_main_entries (context, options, NULL);
- g_option_context_add_group (context, egg_debug_get_option_group ());
+ g_option_context_add_group (context, gpk_debug_get_option_group ());
g_option_context_add_group (context, gtk_get_option_group (TRUE));
g_option_context_parse (context, &argc, &argv, NULL);
g_option_context_free (context);
@@ -90,7 +89,7 @@ main (int argc, char *argv[])
/* check dbus connections, exit if not valid */
connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
if (connection == NULL) {
- egg_warning ("%s", error->message);
+ g_warning ("%s", error->message);
goto out;
}
@@ -100,7 +99,7 @@ main (int argc, char *argv[])
"/org/freedesktop/PackageKit",
"org.freedesktop.PackageKit.Modify");
if (proxy == NULL) {
- egg_warning ("Cannot connect to session service");
+ g_warning ("Cannot connect to session service");
goto out;
}
@@ -120,7 +119,7 @@ main (int argc, char *argv[])
/* TRANSLATORS: we don't have anything more useful to translate. sorry. */
_("The request failed. More details are available in the detailed report."),
error->message);
- egg_warning ("%i: %s", error->code, error->message);
+ g_warning ("%i: %s", error->code, error->message);
goto out;
}
out:
diff --git a/src/gpk-install-local-file.c b/src/gpk-install-local-file.c
index 140f78a..16f8d95 100644
--- a/src/gpk-install-local-file.c
+++ b/src/gpk-install-local-file.c
@@ -27,11 +27,10 @@
#include <locale.h>
#include <dbus/dbus-glib.h>
-#include "egg-debug.h"
-
#include "gpk-common.h"
#include "gpk-error.h"
#include "gpk-dbus.h"
+#include "gpk-debug.h"
/**
* main:
@@ -69,7 +68,7 @@ main (int argc, char *argv[])
context = g_option_context_new ("gpk-install-file");
g_option_context_set_summary (context, _("PackageKit File Installer"));
g_option_context_add_main_entries (context, options, NULL);
- g_option_context_add_group (context, egg_debug_get_option_group ());
+ g_option_context_add_group (context, gpk_debug_get_option_group ());
g_option_context_add_group (context, gtk_get_option_group (TRUE));
g_option_context_parse (context, &argc, &argv, NULL);
g_option_context_free (context);
@@ -90,7 +89,7 @@ main (int argc, char *argv[])
/* check dbus connections, exit if not valid */
connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
if (connection == NULL) {
- egg_warning ("%s", error->message);
+ g_warning ("%s", error->message);
goto out;
}
@@ -100,7 +99,7 @@ main (int argc, char *argv[])
"/org/freedesktop/PackageKit",
"org.freedesktop.PackageKit.Modify");
if (proxy == NULL) {
- egg_warning ("Cannot connect to session service");
+ g_warning ("Cannot connect to session service");
goto out;
}
@@ -120,7 +119,7 @@ main (int argc, char *argv[])
/* TRANSLATORS: we don't have anything more useful to translate. sorry. */
_("The request failed. More details are available in the detailed report."),
error->message);
- egg_warning ("%s", error->message);
+ g_warning ("%s", error->message);
goto out;
}
out:
diff --git a/src/gpk-install-mime-type.c b/src/gpk-install-mime-type.c
index 3960863..8ebe44a 100644
--- a/src/gpk-install-mime-type.c
+++ b/src/gpk-install-mime-type.c
@@ -27,11 +27,10 @@
#include <locale.h>
#include <dbus/dbus-glib.h>
-#include "egg-debug.h"
-
#include "gpk-common.h"
#include "gpk-error.h"
#include "gpk-dbus.h"
+#include "gpk-debug.h"
/**
* main:
@@ -69,7 +68,7 @@ main (int argc, char *argv[])
context = g_option_context_new ("gpk-install-mime-type");
g_option_context_set_summary (context, _("Mime Type Installer"));
g_option_context_add_main_entries (context, options, NULL);
- g_option_context_add_group (context, egg_debug_get_option_group ());
+ g_option_context_add_group (context, gpk_debug_get_option_group ());
g_option_context_add_group (context, gtk_get_option_group (TRUE));
g_option_context_parse (context, &argc, &argv, NULL);
g_option_context_free (context);
@@ -90,7 +89,7 @@ main (int argc, char *argv[])
/* check dbus connections, exit if not valid */
connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
if (connection == NULL) {
- egg_warning ("%s", error->message);
+ g_warning ("%s", error->message);
goto out;
}
@@ -100,7 +99,7 @@ main (int argc, char *argv[])
"/org/freedesktop/PackageKit",
"org.freedesktop.PackageKit.Modify");
if (proxy == NULL) {
- egg_warning ("Cannot connect to session service");
+ g_warning ("Cannot connect to session service");
goto out;
}
@@ -120,7 +119,7 @@ main (int argc, char *argv[])
/* TRANSLATORS: we don't have anything more useful to translate. sorry. */
_("The request failed. More details are available in the detailed report."),
error->message);
- egg_warning ("%s", error->message);
+ g_warning ("%s", error->message);
goto out;
}
out:
diff --git a/src/gpk-install-package-name.c b/src/gpk-install-package-name.c
index 7fc9c6b..630e70d 100644
--- a/src/gpk-install-package-name.c
+++ b/src/gpk-install-package-name.c
@@ -27,11 +27,10 @@
#include <locale.h>
#include <dbus/dbus-glib.h>
-#include "egg-debug.h"
-
#include "gpk-common.h"
#include "gpk-error.h"
#include "gpk-dbus.h"
+#include "gpk-debug.h"
/**
* main:
@@ -68,7 +67,7 @@ main (int argc, char *argv[])
context = g_option_context_new ("gpk-install-package");
g_option_context_set_summary (context, _("Package Name Installer"));
g_option_context_add_main_entries (context, options, NULL);
- g_option_context_add_group (context, egg_debug_get_option_group ());
+ g_option_context_add_group (context, gpk_debug_get_option_group ());
g_option_context_add_group (context, gtk_get_option_group (TRUE));
g_option_context_parse (context, &argc, &argv, NULL);
g_option_context_free (context);
@@ -89,7 +88,7 @@ main (int argc, char *argv[])
/* check dbus connections, exit if not valid */
connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
if (connection == NULL) {
- egg_warning ("%s", error->message);
+ g_warning ("%s", error->message);
goto out;
}
@@ -99,7 +98,7 @@ main (int argc, char *argv[])
"/org/freedesktop/PackageKit",
"org.freedesktop.PackageKit.Modify");
if (proxy == NULL) {
- egg_warning ("Cannot connect to session service");
+ g_warning ("Cannot connect to session service");
goto out;
}
@@ -119,7 +118,7 @@ main (int argc, char *argv[])
/* TRANSLATORS: we don't have anything more useful to translate. sorry. */
_("The request failed. More details are available in the detailed report."),
error->message);
- egg_warning ("%s", error->message);
+ g_warning ("%s", error->message);
goto out;
}
out:
diff --git a/src/gpk-install-provide-file.c b/src/gpk-install-provide-file.c
index a53cf22..5ae74d8 100644
--- a/src/gpk-install-provide-file.c
+++ b/src/gpk-install-provide-file.c
@@ -27,11 +27,10 @@
#include <locale.h>
#include <dbus/dbus-glib.h>
-#include "egg-debug.h"
-
#include "gpk-common.h"
#include "gpk-error.h"
#include "gpk-dbus.h"
+#include "gpk-debug.h"
/**
* main:
@@ -69,7 +68,7 @@ main (int argc, char *argv[])
context = g_option_context_new ("gpk-install-provide-file");
g_option_context_set_summary (context, _("Single File Installer"));
g_option_context_add_main_entries (context, options, NULL);
- g_option_context_add_group (context, egg_debug_get_option_group ());
+ g_option_context_add_group (context, gpk_debug_get_option_group ());
g_option_context_add_group (context, gtk_get_option_group (TRUE));
g_option_context_parse (context, &argc, &argv, NULL);
g_option_context_free (context);
@@ -90,7 +89,7 @@ main (int argc, char *argv[])
/* check dbus connections, exit if not valid */
connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
if (connection == NULL) {
- egg_warning ("%s", error->message);
+ g_warning ("%s", error->message);
goto out;
}
@@ -100,7 +99,7 @@ main (int argc, char *argv[])
"/org/freedesktop/PackageKit",
"org.freedesktop.PackageKit.Modify");
if (proxy == NULL) {
- egg_warning ("Cannot connect to session service");
+ g_warning ("Cannot connect to session service");
goto out;
}
@@ -120,7 +119,7 @@ main (int argc, char *argv[])
/* TRANSLATORS: we don't have anything more useful to translate. sorry. */
_("The request failed. More details are available in the detailed report."),
error->message);
- egg_warning ("%s", error->message);
+ g_warning ("%s", error->message);
goto out;
}
out:
diff --git a/src/gpk-language.c b/src/gpk-language.c
index f798d87..30805c7 100644
--- a/src/gpk-language.c
+++ b/src/gpk-language.c
@@ -24,8 +24,6 @@
#include <string.h>
#include <glib.h>
-#include "egg-debug.h"
-
#include "gpk-language.h"
static void gpk_language_finalize (GObject *object);
diff --git a/src/gpk-log.c b/src/gpk-log.c
index 477f1c2..d348421 100644
--- a/src/gpk-log.c
+++ b/src/gpk-log.c
@@ -31,10 +31,9 @@
#include <packagekit-glib2/packagekit.h>
-#include "egg-debug.h"
-
#include "gpk-common.h"
#include "gpk-gnome.h"
+#include "gpk-debug.h"
static GtkBuilder *builder = NULL;
static GtkListStore *list_store = NULL;
@@ -356,10 +355,10 @@ gpk_log_treeview_clicked_cb (GtkTreeSelection *selection, gpointer data)
gtk_tree_model_get (model, &iter, GPK_LOG_COLUMN_ID, &id, -1);
/* show transaction_id */
- egg_debug ("selected row is: %s", id);
+ g_debug ("selected row is: %s", id);
g_free (id);
} else {
- egg_debug ("no row selected");
+ g_debug ("no row selected");
}
}
@@ -390,7 +389,7 @@ gpk_log_filter (PkTransactionPast *item)
/* only show transactions that succeeded */
if (!succeeded) {
- egg_debug ("tid %s did not succeed, so not adding", tid);
+ g_debug ("tid %s did not succeed, so not adding", tid);
return FALSE;
}
@@ -555,7 +554,7 @@ gpk_log_refilter (void)
else
filter = NULL;
- egg_debug ("len=%i", transactions->len);
+ g_debug ("len=%i", transactions->len);
/* mark the items as not used */
treeview = GTK_TREE_VIEW (gtk_builder_get_object (builder, "treeview_simple"));
@@ -588,7 +587,7 @@ gpk_log_get_old_transactions_cb (GObject *object, GAsyncResult *res, gpointer us
/* get the results */
results = pk_client_generic_finish (client, res, &error);
if (results == NULL) {
- egg_warning ("failed to get old transactions: %s", error->message);
+ g_warning ("failed to get old transactions: %s", error->message);
g_error_free (error);
goto out;
}
@@ -596,7 +595,7 @@ gpk_log_get_old_transactions_cb (GObject *object, GAsyncResult *res, gpointer us
/* check error code */
error_code = pk_results_get_error_code (results);
if (error_code != NULL) {
- egg_warning ("failed to get old transactions: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ g_warning ("failed to get old transactions: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
goto out;
}
@@ -706,7 +705,7 @@ gpk_log_startup_cb (GtkApplication *application, gpointer user_data)
builder = gtk_builder_new ();
retval = gtk_builder_add_from_file (builder, GPK_DATA "/gpk-log.ui", &error);
if (retval == 0) {
- egg_warning ("failed to load ui: %s", error->message);
+ g_warning ("failed to load ui: %s", error->message);
g_error_free (error);
goto out;
}
@@ -787,7 +786,7 @@ gpk_log_startup_cb (GtkApplication *application, gpointer user_data)
/* set the parent window if it is specified */
if (xid != 0) {
- egg_debug ("Setting xid %i", xid);
+ g_debug ("Setting xid %i", xid);
gpk_window_set_parent_xid (GTK_WINDOW (widget), xid);
}
@@ -837,7 +836,7 @@ main (int argc, char *argv[])
context = g_option_context_new (NULL);
g_option_context_set_summary (context, _("Software Log Viewer"));
g_option_context_add_main_entries (context, options, NULL);
- g_option_context_add_group (context, egg_debug_get_option_group ());
+ g_option_context_add_group (context, gpk_debug_get_option_group ());
g_option_context_add_group (context, gtk_get_option_group (TRUE));
g_option_context_parse (context, &argc, &argv, NULL);
g_option_context_free (context);
diff --git a/src/gpk-modal-dialog.c b/src/gpk-modal-dialog.c
index a09b404..455cba4 100644
--- a/src/gpk-modal-dialog.c
+++ b/src/gpk-modal-dialog.c
@@ -36,7 +36,6 @@
#include <glib/gi18n.h>
#include <packagekit-glib2/packagekit.h>
-#include "egg-debug.h"
#include "egg-string.h"
#include "gpk-animated-icon.h"
@@ -194,7 +193,6 @@ gpk_modal_dialog_present_with_time (GpkModalDialog *dialog, guint32 timestamp)
gtk_widget_realize (widget);
gtk_window_present_with_time (GTK_WINDOW (widget), timestamp);
-
return TRUE;
}
@@ -223,7 +221,7 @@ gpk_modal_dialog_set_parent (GpkModalDialog *dialog, GdkWindow *window)
/* not sure what to do here, should probably unparent somehow */
if (window == NULL) {
- egg_warning ("parent set NULL when already modal with another window, setting non-modal");
+ g_warning ("parent set NULL when already modal with another window, setting non-modal");
widget = GTK_WIDGET (gtk_builder_get_object (dialog->priv->builder, "dialog_client"));
gtk_window_set_modal (GTK_WINDOW (widget), FALSE);
dialog->priv->has_parent = FALSE;
@@ -237,7 +235,7 @@ gpk_modal_dialog_set_parent (GpkModalDialog *dialog, GdkWindow *window)
/* check we are a valid window */
if (!GDK_WINDOW (window)) {
- egg_warning ("not a valid GdkWindow!");
+ g_warning ("not a valid GdkWindow!");
return FALSE;
}
@@ -261,7 +259,7 @@ gpk_modal_dialog_set_window_title (GpkModalDialog *dialog, const gchar *title)
g_return_val_if_fail (GPK_IS_CLIENT_DIALOG (dialog), FALSE);
g_return_val_if_fail (title != NULL, FALSE);
- egg_debug ("setting window title: %s", title);
+ g_debug ("setting window title: %s", title);
window = GTK_WINDOW (gtk_builder_get_object (dialog->priv->builder, "dialog_client"));
gtk_window_set_title (window, title);
return TRUE;
@@ -278,7 +276,7 @@ gpk_modal_dialog_set_window_icon (GpkModalDialog *dialog, const gchar *icon)
g_return_val_if_fail (GPK_IS_CLIENT_DIALOG (dialog), FALSE);
g_return_val_if_fail (icon != NULL, FALSE);
- egg_debug ("setting window icon: %s", icon);
+ g_debug ("setting window icon: %s", icon);
window = GTK_WINDOW (gtk_builder_get_object (dialog->priv->builder, "dialog_client"));
gtk_window_set_icon_name (window, icon);
return TRUE;
@@ -305,7 +303,7 @@ gpk_modal_dialog_set_title (GpkModalDialog *dialog, const gchar *title)
dialog->priv->title = g_strdup (title);
title_bold = g_strdup_printf ("<b><big>%s</big></b>", title);
- egg_debug ("setting title: %s", title_bold);
+ g_debug ("setting title: %s", title_bold);
label = GTK_LABEL (gtk_builder_get_object (dialog->priv->builder, "label_title"));
gtk_label_set_markup (label, title_bold);
g_free (title_bold);
@@ -327,7 +325,7 @@ gpk_modal_dialog_set_message (GpkModalDialog *dialog, const gchar *message)
if (!dialog->priv->show_progress_files)
return FALSE;
- egg_debug ("setting message: %s", message);
+ g_debug ("setting message: %s", message);
label = GTK_LABEL (gtk_builder_get_object (dialog->priv->builder, "label_message"));
gtk_label_set_markup (label, message);
return TRUE;
@@ -343,7 +341,7 @@ gpk_modal_dialog_set_action (GpkModalDialog *dialog, const gchar *action)
g_return_val_if_fail (GPK_IS_CLIENT_DIALOG (dialog), FALSE);
- egg_debug ("setting action: %s", action);
+ g_debug ("setting action: %s", action);
widget = GTK_WIDGET (gtk_builder_get_object (dialog->priv->builder, "button_action"));
if (action != NULL)
gtk_button_set_label (GTK_BUTTON (widget), action);
@@ -365,7 +363,7 @@ gpk_modal_dialog_pulse_progress (GpkModalDialog *dialog)
/* debug so we can catch polling */
if (rate_limit++ % 20 == 0)
- egg_debug ("polling check");
+ g_debug ("polling check");
widget = GTK_WIDGET (gtk_builder_get_object (dialog->priv->builder, "progressbar_percent"));
gtk_progress_bar_pulse (GTK_PROGRESS_BAR (widget));
@@ -398,7 +396,7 @@ gpk_modal_dialog_set_percentage (GpkModalDialog *dialog, gint percentage)
g_return_val_if_fail (GPK_IS_CLIENT_DIALOG (dialog), FALSE);
g_return_val_if_fail (percentage <= 100, FALSE);
- egg_debug ("setting percentage: %u", percentage);
+ g_debug ("setting percentage: %u", percentage);
progress_bar = GTK_PROGRESS_BAR (gtk_builder_get_object (dialog->priv->builder, "progressbar_percent"));
if (dialog->priv->pulse_timer_id != 0) {
@@ -426,7 +424,7 @@ gpk_modal_dialog_set_remaining (GpkModalDialog *dialog, guint remaining)
g_return_val_if_fail (GPK_IS_CLIENT_DIALOG (dialog), FALSE);
- egg_debug ("setting remaining: %u", remaining);
+ g_debug ("setting remaining: %u", remaining);
progress_bar = GTK_PROGRESS_BAR (gtk_builder_get_object (dialog->priv->builder, "progressbar_percent"));
/* unknown */
@@ -457,7 +455,7 @@ gpk_modal_dialog_set_image (GpkModalDialog *dialog, const gchar *image)
/* set state */
dialog->priv->set_image = TRUE;
- egg_debug ("setting image: %s", image);
+ g_debug ("setting image: %s", image);
gpk_animated_icon_enable_animation (GPK_ANIMATED_ICON (dialog->priv->image_status), FALSE);
gtk_image_set_from_icon_name (GTK_IMAGE (dialog->priv->image_status), image, GTK_ICON_SIZE_DIALOG);
return TRUE;
@@ -702,7 +700,6 @@ gpk_modal_dialog_set_package_list (GpkModalDialog *dialog, const GPtrArray *list
return TRUE;
}
-
/**
* gpk_dialog_treeview_for_package_list:
**/
@@ -821,7 +818,7 @@ gpk_modal_dialog_init (GpkModalDialog *dialog)
dialog->priv->builder = gtk_builder_new ();
retval = gtk_builder_add_from_file (dialog->priv->builder, GPK_DATA "/gpk-client.ui", &error);
if (retval == 0) {
- egg_warning ("failed to load ui: %s", error->message);
+ g_warning ("failed to load ui: %s", error->message);
g_error_free (error);
goto out_build;
}
@@ -884,7 +881,7 @@ gpk_modal_dialog_finalize (GObject *object)
/* shouldn't be, but just in case */
if (g_main_loop_is_running (dialog->priv->loop)) {
- egg_warning ("mainloop running on exit");
+ g_warning ("mainloop running on exit");
g_main_loop_quit (dialog->priv->loop);
}
diff --git a/src/gpk-self-test.c b/src/gpk-self-test.c
index a65f472..a55609b 100644
--- a/src/gpk-self-test.c
+++ b/src/gpk-self-test.c
@@ -22,7 +22,6 @@
#include <glib.h>
#include <glib-object.h>
#include "egg-test.h"
-#include "egg-debug.h"
#include "gpk-common.h"
#include "gpk-enum.h"
#include "gpk-task.h"
@@ -46,7 +45,7 @@ main (int argc, char **argv)
g_type_init ();
gtk_init (&argc, &argv);
test = egg_test_init ();
- egg_debug_init (&argc, &argv);
+ g_debug_init (&argc, &argv);
/* tests go here */
egg_markdown_test (test);
diff --git a/src/gpk-service-pack.c b/src/gpk-service-pack.c
index bdcd75f..b418cd6 100644
--- a/src/gpk-service-pack.c
+++ b/src/gpk-service-pack.c
@@ -28,7 +28,6 @@
#include <sys/utsname.h>
#include <packagekit-glib2/packagekit.h>
-#include "egg-debug.h"
#include "egg-string.h"
#include "gpk-common.h"
@@ -194,7 +193,7 @@ gpk_pack_resolve_package_id (const gchar *package)
packages = g_strsplit (package, ";", 0);
results = pk_client_resolve (client, pk_bitfield_value (PK_FILTER_ENUM_NEWEST), packages, NULL, NULL, NULL, &error);
if (results == NULL) {
- egg_warning ("failed to resolve: %s", error->message);
+ g_warning ("failed to resolve: %s", error->message);
g_error_free (error);
goto out;
}
@@ -202,7 +201,7 @@ gpk_pack_resolve_package_id (const gchar *package)
/* check error code */
error_code = pk_results_get_error_code (results);
if (error_code != NULL) {
- egg_warning ("failed to resolve: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ g_warning ("failed to resolve: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
goto out;
}
@@ -215,7 +214,7 @@ gpk_pack_resolve_package_id (const gchar *package)
/* display warning if not exactly one match */
if (array->len > 1)
- egg_warning ("More than one possible package for '%s' found!", package);
+ g_warning ("More than one possible package for '%s' found!", package);
/* convert to a text package id */
item = g_ptr_array_index (array, 0);
@@ -342,7 +341,7 @@ gpk_pack_copy_package_lists (const gchar *filename, GError **error)
/* check error code */
error_code = pk_results_get_error_code (results);
if (error_code != NULL) {
- egg_warning ("failed to get packages: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ g_warning ("failed to get packages: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
goto out;
}
@@ -411,7 +410,6 @@ gpk_pack_ready_cb (GObject *object, GAsyncResult *res, gpointer userdata)
gpk_pack_reset_ui ();
}
-
/**
* gpk_pack_progress_cb:
**/
@@ -432,7 +430,7 @@ gpk_pack_progress_cb (PkProgress *progress, PkProgressType type, gpointer userda
NULL);
if (type == PK_PROGRESS_TYPE_STATUS) {
- egg_debug ("now %s", pk_status_enum_to_text (status));
+ g_debug ("now %s", pk_status_enum_to_text (status));
} else if (type == PK_PROGRESS_TYPE_PERCENTAGE) {
gpk_pack_set_percentage (percentage);
} else if (type == PK_PROGRESS_TYPE_PACKAGE_ID) {
@@ -587,7 +585,7 @@ gpk_pack_button_create_cb (GtkWidget *widget2, gpointer data)
/* check error code */
error_code = pk_results_get_error_code (results);
if (error_code != NULL) {
- egg_warning ("failed to refresh cache: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ g_warning ("failed to refresh cache: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
goto out;
}
@@ -636,7 +634,7 @@ static void
gpk_pack_radio_updates_cb (GtkWidget *widget2, gpointer data)
{
GtkWidget *widget;
- egg_debug ("got updates");
+ g_debug ("got updates");
widget = GTK_WIDGET (gtk_builder_get_object (builder, "entry_package"));
gtk_widget_set_sensitive (widget, FALSE);
widget = GTK_WIDGET (gtk_builder_get_object (builder, "filechooserbutton_exclude"));
@@ -651,7 +649,7 @@ static void
gpk_pack_radio_package_cb (GtkWidget *widget2, gpointer data)
{
GtkWidget *widget;
- egg_debug ("got package");
+ g_debug ("got package");
widget = GTK_WIDGET (gtk_builder_get_object (builder, "entry_package"));
gtk_widget_set_sensitive (widget, TRUE);
widget = GTK_WIDGET (gtk_builder_get_object (builder, "filechooserbutton_exclude"));
@@ -666,7 +664,7 @@ static void
gpk_pack_radio_copy_cb (GtkWidget *widget2, gpointer data)
{
GtkWidget *widget;
- egg_debug ("got copy");
+ g_debug ("got copy");
widget = GTK_WIDGET (gtk_builder_get_object (builder, "entry_package"));
gtk_widget_set_sensitive (widget, FALSE);
widget = GTK_WIDGET (gtk_builder_get_object (builder, "filechooserbutton_exclude"));
@@ -718,7 +716,7 @@ gpk_pack_startup_cb (GtkApplication *application, gpointer user_data)
control = pk_control_new ();
ret = pk_control_get_properties (control, NULL, &error);
if (!ret) {
- egg_error ("Failed to contact PackageKit: %s", error->message);
+ g_error ("Failed to contact PackageKit: %s", error->message);
g_error_free (error);
}
@@ -726,7 +724,7 @@ gpk_pack_startup_cb (GtkApplication *application, gpointer user_data)
builder = gtk_builder_new ();
retval = gtk_builder_add_from_file (builder, GPK_DATA "/gpk-service-pack.ui", &error);
if (retval == 0) {
- egg_warning ("failed to load ui: %s", error->message);
+ g_warning ("failed to load ui: %s", error->message);
g_error_free (error);
goto out;
}
diff --git a/src/gpk-session.c b/src/gpk-session.c
index 23d3f3e..caa5078 100644
--- a/src/gpk-session.c
+++ b/src/gpk-session.c
@@ -28,7 +28,6 @@
#include "gpk-session.h"
#include "gpk-common.h"
-#include "egg-debug.h"
static void gpk_session_finalize (GObject *object);
@@ -92,7 +91,7 @@ gpk_session_logout (GpkSession *session)
/* no gnome-session */
if (session->priv->proxy == NULL) {
- egg_warning ("no gnome-session");
+ g_warning ("no gnome-session");
return FALSE;
}
@@ -132,7 +131,7 @@ gpk_session_presence_status_changed_cb (DBusGProxy *proxy, guint status, GpkSess
gboolean is_idle;
is_idle = (status == GPK_SESSION_STATUS_ENUM_IDLE);
if (is_idle != session->priv->is_idle_old) {
- egg_debug ("emitting idle-changed : (%i)", is_idle);
+ g_debug ("emitting idle-changed : (%i)", is_idle);
session->priv->is_idle_old = is_idle;
g_signal_emit (session, signals [IDLE_CHANGED], 0, is_idle);
}
@@ -151,7 +150,7 @@ gpk_session_is_idle (GpkSession *session)
/* no gnome-session */
if (session->priv->proxy_prop == NULL) {
- egg_warning ("no gnome-session");
+ g_warning ("no gnome-session");
goto out;
}
@@ -164,7 +163,7 @@ gpk_session_is_idle (GpkSession *session)
G_TYPE_VALUE, value,
G_TYPE_INVALID);
if (!ret) {
- egg_warning ("failed to get idle status: %s", error->message);
+ g_warning ("failed to get idle status: %s", error->message);
g_error_free (error);
is_idle = FALSE;
goto out;
@@ -187,7 +186,7 @@ gpk_session_is_inhibited (GpkSession *session)
/* no gnome-session */
if (session->priv->proxy == NULL) {
- egg_warning ("no gnome-session");
+ g_warning ("no gnome-session");
goto out;
}
@@ -198,7 +197,7 @@ gpk_session_is_inhibited (GpkSession *session)
G_TYPE_BOOLEAN, &is_inhibited,
G_TYPE_INVALID);
if (!ret) {
- egg_warning ("failed to get inhibit status: %s", error->message);
+ g_warning ("failed to get inhibit status: %s", error->message);
g_error_free (error);
is_inhibited = FALSE;
}
@@ -212,7 +211,7 @@ out:
static void
gpk_session_stop_cb (DBusGProxy *proxy, GpkSession *session)
{
- egg_debug ("emitting ::stop()");
+ g_debug ("emitting ::stop()");
g_signal_emit (session, signals [STOP], 0);
}
@@ -222,7 +221,7 @@ gpk_session_stop_cb (DBusGProxy *proxy, GpkSession *session)
static void
gpk_session_query_end_session_cb (DBusGProxy *proxy, guint flags, GpkSession *session)
{
- egg_debug ("emitting ::query-end-session(%i)", flags);
+ g_debug ("emitting ::query-end-session(%i)", flags);
g_signal_emit (session, signals [QUERY_END_SESSION], 0, flags);
}
@@ -232,7 +231,7 @@ gpk_session_query_end_session_cb (DBusGProxy *proxy, guint flags, GpkSession *se
static void
gpk_session_end_session_cb (DBusGProxy *proxy, guint flags, GpkSession *session)
{
- egg_debug ("emitting ::end-session(%i)", flags);
+ g_debug ("emitting ::end-session(%i)", flags);
g_signal_emit (session, signals [END_SESSION], 0, flags);
}
@@ -250,7 +249,7 @@ gpk_session_end_session_response (GpkSession *session, gboolean is_okay, const g
/* no gnome-session */
if (session->priv->proxy_client_private == NULL) {
- egg_warning ("no gnome-session proxy");
+ g_warning ("no gnome-session proxy");
goto out;
}
@@ -261,7 +260,7 @@ gpk_session_end_session_response (GpkSession *session, gboolean is_okay, const g
G_TYPE_INVALID,
G_TYPE_INVALID);
if (!ret) {
- egg_warning ("failed to send session response: %s", error->message);
+ g_warning ("failed to send session response: %s", error->message);
g_error_free (error);
goto out;
}
@@ -284,7 +283,7 @@ gpk_session_register_client (GpkSession *session, const gchar *app_id, const gch
/* no gnome-session */
if (session->priv->proxy == NULL) {
- egg_warning ("no gnome-session");
+ g_warning ("no gnome-session");
goto out;
}
@@ -296,7 +295,7 @@ gpk_session_register_client (GpkSession *session, const gchar *app_id, const gch
DBUS_TYPE_G_OBJECT_PATH, &client_id,
G_TYPE_INVALID);
if (!ret) {
- egg_warning ("failed to register client '%s': %s", client_startup_id, error->message);
+ g_warning ("failed to register client '%s': %s", client_startup_id, error->message);
g_error_free (error);
goto out;
}
@@ -306,7 +305,7 @@ gpk_session_register_client (GpkSession *session, const gchar *app_id, const gch
session->priv->proxy_client_private = dbus_g_proxy_new_for_name_owner (connection, GPK_SESSION_MANAGER_SERVICE,
client_id, GPK_SESSION_MANAGER_CLIENT_PRIVATE_INTERFACE, &error);
if (session->priv->proxy_client_private == NULL) {
- egg_warning ("DBUS error: %s", error->message);
+ g_warning ("DBUS error: %s", error->message);
g_error_free (error);
goto out;
}
@@ -323,7 +322,7 @@ gpk_session_register_client (GpkSession *session, const gchar *app_id, const gch
dbus_g_proxy_add_signal (session->priv->proxy_client_private, "EndSession", G_TYPE_UINT, G_TYPE_INVALID);
dbus_g_proxy_connect_signal (session->priv->proxy_client_private, "EndSession", G_CALLBACK (gpk_session_end_session_cb), session, NULL);
- egg_debug ("registered startup '%s' to client id '%s'", client_startup_id, client_id);
+ g_debug ("registered startup '%s' to client id '%s'", client_startup_id, client_id);
out:
g_free (client_id);
return ret;
@@ -339,7 +338,7 @@ gpk_session_inhibit_changed_cb (DBusGProxy *proxy, const gchar *id, GpkSession *
is_inhibited = gpk_session_is_inhibited (session);
if (is_inhibited != session->priv->is_inhibited_old) {
- egg_debug ("emitting inhibited-changed : (%i)", is_inhibited);
+ g_debug ("emitting inhibited-changed : (%i)", is_inhibited);
session->priv->is_inhibited_old = is_inhibited;
g_signal_emit (session, signals [INHIBITED_CHANGED], 0, is_inhibited);
}
@@ -422,7 +421,7 @@ gpk_session_init (GpkSession *session)
GPK_SESSION_MANAGER_PATH,
GPK_SESSION_MANAGER_INTERFACE, &error);
if (session->priv->proxy == NULL) {
- egg_warning ("DBUS error: %s", error->message);
+ g_warning ("DBUS error: %s", error->message);
g_error_free (error);
return;
}
@@ -432,7 +431,7 @@ gpk_session_init (GpkSession *session)
GPK_SESSION_MANAGER_PRESENCE_PATH,
GPK_SESSION_MANAGER_PRESENCE_INTERFACE, &error);
if (session->priv->proxy_presence == NULL) {
- egg_warning ("DBUS error: %s", error->message);
+ g_warning ("DBUS error: %s", error->message);
g_error_free (error);
return;
}
@@ -442,7 +441,7 @@ gpk_session_init (GpkSession *session)
GPK_SESSION_MANAGER_PRESENCE_PATH,
GPK_DBUS_PROPERTIES_INTERFACE, &error);
if (session->priv->proxy_prop == NULL) {
- egg_warning ("DBUS error: %s", error->message);
+ g_warning ("DBUS error: %s", error->message);
g_error_free (error);
return;
}
@@ -462,7 +461,7 @@ gpk_session_init (GpkSession *session)
/* coldplug */
session->priv->is_inhibited_old = gpk_session_is_inhibited (session);
session->priv->is_idle_old = gpk_session_is_idle (session);
- egg_debug ("idle: %i, inhibited: %i", session->priv->is_idle_old, session->priv->is_inhibited_old);
+ g_debug ("idle: %i, inhibited: %i", session->priv->is_idle_old, session->priv->is_inhibited_old);
}
/**
diff --git a/src/gpk-task.c b/src/gpk-task.c
index 0e5cc79..4403c3b 100644
--- a/src/gpk-task.c
+++ b/src/gpk-task.c
@@ -24,8 +24,6 @@
#include <glib/gi18n.h>
#include <packagekit-glib2/packagekit.h>
-#include "egg-debug.h"
-
#include "gpk-task.h"
#include "gpk-gnome.h"
#include "gpk-common.h"
@@ -197,7 +195,7 @@ gpk_task_key_question (PkTask *task, guint request, PkResults *results)
/* get data */
array = pk_results_get_repo_signature_required_array (results);
if (array->len != 1) {
- egg_warning ("array length %i, aborting", array->len);
+ g_warning ("array length %i, aborting", array->len);
goto out;
}
@@ -268,7 +266,7 @@ gpk_task_eula_question (PkTask *task, guint request, PkResults *results)
/* get data */
array = pk_results_get_eula_required_array (results);
if (array->len != 1) {
- egg_warning ("array length %i, aborting", array->len);
+ g_warning ("array length %i, aborting", array->len);
goto out;
}
@@ -337,7 +335,7 @@ gpk_task_media_change_question (PkTask *task, guint request, PkResults *results)
/* get data */
array = pk_results_get_media_change_required_array (results);
if (array->len != 1) {
- egg_warning ("array length %i, aborting", array->len);
+ g_warning ("array length %i, aborting", array->len);
goto out;
}
@@ -389,7 +387,7 @@ gpk_task_add_dialog_deps_section (PkTask *task, PkPackageSack *sack, PkInfoEnum
sack_tmp = pk_package_sack_filter_by_info (sack, info);
if (pk_package_sack_get_size (sack_tmp) == 0) {
- egg_debug ("no packages with %s", pk_info_enum_to_string (info));
+ g_debug ("no packages with %s", pk_info_enum_to_string (info));
goto out;
}
@@ -425,7 +423,7 @@ gpk_task_add_dialog_deps_section (PkTask *task, PkPackageSack *sack, PkInfoEnum
/* get the size */
ret = pk_package_sack_get_details (sack_tmp, NULL, &error);
if (!ret) {
- egg_warning ("failed to get details about packages: %s", error->message);
+ g_warning ("failed to get details about packages: %s", error->message);
g_error_free (error);
}
size = pk_package_sack_get_total_bytes (sack_tmp);
@@ -470,7 +468,7 @@ gpk_task_simulate_question (PkTask *task, guint request, PkResults *results)
/* have we previously said we don't want to be shown the confirmation */
ret = g_settings_get_boolean (priv->settings, GPK_SETTINGS_SHOW_DEPENDS);
if (!ret) {
- egg_debug ("we've said we don't want the dep dialog");
+ g_debug ("we've said we don't want the dep dialog");
pk_task_user_accepted (PK_TASK(task), priv->request);
goto out;
}
@@ -568,7 +566,7 @@ gpk_task_setup_dialog_untrusted (GpkTask *task)
task->priv->builder_untrusted = gtk_builder_new ();
retval = gtk_builder_add_from_file (task->priv->builder_untrusted, GPK_DATA "/gpk-error.ui", &error);
if (retval == 0) {
- egg_warning ("failed to load ui: %s", error->message);
+ g_warning ("failed to load ui: %s", error->message);
g_error_free (error);
}
@@ -616,7 +614,7 @@ gpk_task_setup_dialog_signature (GpkTask *task)
task->priv->builder_signature = gtk_builder_new ();
retval = gtk_builder_add_from_file (task->priv->builder_signature, GPK_DATA "/gpk-signature.ui", &error);
if (retval == 0) {
- egg_warning ("failed to load ui: %s", error->message);
+ g_warning ("failed to load ui: %s", error->message);
g_error_free (error);
}
@@ -651,7 +649,7 @@ gpk_task_setup_dialog_eula (GpkTask *task)
task->priv->builder_eula = gtk_builder_new ();
retval = gtk_builder_add_from_file (task->priv->builder_eula, GPK_DATA "/gpk-eula.ui", &error);
if (retval == 0) {
- egg_warning ("failed to load ui: %s", error->message);
+ g_warning ("failed to load ui: %s", error->message);
g_error_free (error);
}
@@ -792,7 +790,7 @@ gpk_task_test_progress_cb (PkProgress *progress, PkProgressType type, EggTest *t
g_object_get (progress,
"status", &status,
NULL);
- egg_debug ("now %s", pk_status_enum_to_text (status));
+ g_debug ("now %s", pk_status_enum_to_text (status));
}
}
diff --git a/src/gpk-update-icon.c b/src/gpk-update-icon.c
index 25f0354..e4a0677 100644
--- a/src/gpk-update-icon.c
+++ b/src/gpk-update-icon.c
@@ -33,7 +33,6 @@
#include <libnotify/notify.h>
#include <packagekit-glib2/packagekit.h>
-#include "egg-debug.h"
#include "egg-dbus-monitor.h"
#include "gpk-check-update.h"
@@ -41,6 +40,7 @@
#include "gpk-firmware.h"
#include "gpk-hardware.h"
#include "gpk-common.h"
+#include "gpk-debug.h"
static GpkCheckUpdate *cupdate = NULL;
static GpkWatch *watch = NULL;
@@ -106,7 +106,7 @@ gpm_pack_commandline_cb (GApplication *application,
context = g_option_context_new (NULL);
g_option_context_set_summary (context, _("Update Applet"));
g_option_context_add_main_entries (context, options, NULL);
- g_option_context_add_group (context, egg_debug_get_option_group ());
+ g_option_context_add_group (context, gpk_debug_get_option_group ());
g_option_context_add_group (context, gtk_get_option_group (TRUE));
g_option_context_parse (context, &argc, &argv, NULL);
g_option_context_free (context);
@@ -119,7 +119,7 @@ gpm_pack_commandline_cb (GApplication *application,
/* TRANSLATORS: title to pass to to the user if there are not enough privs */
ret = gpk_check_privileged_user (_("Update applet"), FALSE);
if (!ret) {
- egg_warning ("Exit: gpk_check_privileged_user returned FALSE");
+ g_warning ("Exit: gpk_check_privileged_user returned FALSE");
return 1;
}
diff --git a/src/gpk-update-viewer.c b/src/gpk-update-viewer.c
index 3e7d921..6b9c0d1 100644
--- a/src/gpk-update-viewer.c
+++ b/src/gpk-update-viewer.c
@@ -31,7 +31,6 @@
#include <locale.h>
#include <packagekit-glib2/packagekit.h>
-#include "egg-debug.h"
#include "egg-string.h"
#include "egg-markdown.h"
#include "egg-console-kit.h"
@@ -46,6 +45,7 @@
#include "gpk-gnome.h"
#include "gpk-session.h"
#include "gpk-task.h"
+#include "gpk-debug.h"
#define GPK_UPDATE_VIEWER_AUTO_QUIT_TIMEOUT 10 /* seconds */
#define GPK_UPDATE_VIEWER_AUTO_RESTART_TIMEOUT 60 /* seconds */
@@ -168,7 +168,7 @@ gpk_update_viewer_packages_set_sensitive (gboolean sensitive)
static gboolean
gpk_update_viewer_auto_shutdown_cb (GtkDialog *dialog)
{
- egg_debug ("autoclosing dialog");
+ g_debug ("autoclosing dialog");
gtk_dialog_response (dialog, GTK_RESPONSE_CANCEL);
return FALSE;
}
@@ -187,7 +187,7 @@ gpk_update_viewer_error_dialog (const gchar *title, const gchar *message, const
message = _("Failed to process request.");
}
- egg_warning ("%s: %s", title, details);
+ g_warning ("%s: %s", title, details);
window = GTK_WINDOW(gtk_builder_get_object (builder, "dialog_updates"));
gpk_error_dialog_modal (window, title, message, details);
}
@@ -235,7 +235,7 @@ gpk_update_viewer_check_restart (void)
button = _("Log Out");
} else {
- egg_warning ("unknown restart enum");
+ g_warning ("unknown restart enum");
goto out;
}
@@ -424,7 +424,7 @@ gpk_update_viewer_update_packages_cb (PkTask *_task, GAsyncResult *res, gpointer
/* TRANSLATORS: the PackageKit request did not complete, and it did not send an error */
gpk_update_viewer_error_dialog (_("Could not update packages"), NULL, error->message);
} else if (error->code == PK_CLIENT_ERROR_DECLINED_SIMULATION) {
- egg_debug ("ignoring the declined-simulation error");
+ g_debug ("ignoring the declined-simulation error");
} else if (error->code > PK_CLIENT_ERROR_LAST) {
gint code = error->code - PK_CLIENT_ERROR_LAST;
/* we've passed the PackageKit error code in the GError->code */
@@ -450,7 +450,7 @@ gpk_update_viewer_update_packages_cb (PkTask *_task, GAsyncResult *res, gpointer
/* check error code */
error_code = pk_results_get_error_code (results);
if (error_code != NULL) {
- egg_warning ("failed to update packages: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ g_warning ("failed to update packages: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
/* failed sound, using sounds from the naming spec */
ca_context_play (ca_gtk_context_get (), 0,
@@ -573,7 +573,6 @@ out:
g_object_unref (results);
}
-
static GSList *active_rows = NULL;
static guint active_row_timeout_id = 0;
@@ -647,7 +646,7 @@ gpk_update_viewer_add_active_row (GtkTreeModel *model, GtkTreePath *path)
goto out;
row = g_slist_find_custom (active_rows, (gconstpointer)ref, (GCompareFunc)gpk_update_viewer_compare_refs);
if (row != NULL) {
- egg_debug ("already active");
+ g_debug ("already active");
gtk_tree_row_reference_free (ref);
goto out;
}
@@ -679,7 +678,7 @@ gpk_update_viewer_remove_active_row (GtkTreeModel *model, GtkTreePath *path)
row = g_slist_find_custom (active_rows, (gconstpointer)ref, (GCompareFunc)gpk_update_viewer_compare_refs);
gtk_tree_row_reference_free (ref);
if (row == NULL) {
- egg_warning ("row not already added");
+ g_warning ("row not already added");
return;
}
@@ -894,7 +893,7 @@ gpk_update_viewer_progress_cb (PkProgress *progress, PkProgressType type, gpoint
ret = gpk_update_viewer_find_parent (package_id, &parent);
text = gpk_package_id_format_twoline (package_id, summary);
- egg_debug ("adding: id=%s, text=%s", package_id, text);
+ g_debug ("adding: id=%s, text=%s", package_id, text);
/* do we add to a parent? */
if (ret)
@@ -918,7 +917,7 @@ gpk_update_viewer_progress_cb (PkProgress *progress, PkProgressType type, gpoint
g_free (text);
path = gpk_update_viewer_model_get_path (model, package_id);
if (path == NULL) {
- egg_warning ("found no package %s", package_id);
+ g_warning ("found no package %s", package_id);
goto out;
}
}
@@ -966,7 +965,7 @@ gpk_update_viewer_progress_cb (PkProgress *progress, PkProgressType type, gpoint
GdkDisplay *display;
GdkCursor *cursor;
- egg_debug ("status %s", pk_status_enum_to_text (status));
+ g_debug ("status %s", pk_status_enum_to_text (status));
/* use correct status pane */
widget = GTK_WIDGET(gtk_builder_get_object (builder, "hbox_status"));
@@ -1033,13 +1032,13 @@ gpk_update_viewer_progress_cb (PkProgress *progress, PkProgressType type, gpoint
model = gtk_tree_view_get_model (treeview);
if (package_id_last == NULL) {
- egg_debug ("no last package");
+ g_debug ("no last package");
return;
}
path = gpk_update_viewer_model_get_path (model, package_id_last);
if (path == NULL) {
- egg_debug ("not found ID for package");
+ g_debug ("not found ID for package");
return;
}
@@ -1190,7 +1189,7 @@ gpk_update_viewer_button_install_cb (GtkWidget *widget, gpointer user_data)
/* hide the held-back notice */
gtk_widget_hide (info_updates);
- egg_debug ("Doing the package updates");
+ g_debug ("Doing the package updates");
/* no not allow to be unclicked at install time */
gpk_update_viewer_packages_set_sensitive (FALSE);
@@ -1402,7 +1401,6 @@ gpk_update_viewer_modal_error_with_timeout (const gchar *title, const gchar *mes
gpk_update_viewer_quit ();
}
-
/**
* gpk_update_viewer_reconsider_info:
**/
@@ -1425,7 +1423,7 @@ gpk_update_viewer_reconsider_info (void)
NULL);
/* not when offline */
- egg_debug ("network status is %s", pk_network_enum_to_text (state));
+ g_debug ("network status is %s", pk_network_enum_to_text (state));
if (state == PK_NETWORK_ENUM_OFFLINE) {
gpk_update_viewer_modal_error_with_timeout (
/* TRANSLATORS: title: nothing to do */
@@ -1547,7 +1545,7 @@ gpk_update_viewer_treeview_update_toggled (GtkCellRendererToggle *cell, gchar *p
/* unstage */
update ^= 1;
- egg_debug ("update %s[%i]", package_id, update);
+ g_debug ("update %s[%i]", package_id, update);
g_free (package_id);
/* set new value */
@@ -1574,7 +1572,7 @@ gpk_update_viewer_treeview_updates_size_allocate_cb (GtkWidget *widget, GtkAlloc
width = gtk_tree_view_column_get_width (column);
wrap_width = allocation->width - width - 200;
if (wrap_width < 10) {
- egg_warning ("wrap_width is impossibly small %i", wrap_width);
+ g_warning ("wrap_width is impossibly small %i", wrap_width);
return;
}
g_object_set (cell, "wrap-width", wrap_width, NULL);
@@ -1807,7 +1805,7 @@ gpk_update_viewer_get_uris (const gchar *url_string)
/* could we have malformed descriptions with ';' in them? */
if (length % 2 != 0) {
- egg_warning ("length not correct, correcting");
+ g_warning ("length not correct, correcting");
length--;
}
@@ -1836,7 +1834,7 @@ gpk_update_viewer_iso8601_format_locale_date (const gchar *iso_date)
/* parse ISO8601 date */
ret = g_time_val_from_iso8601 (iso_date, &timeval);
if (!ret) {
- egg_warning ("failed to parse %s, falling back to ISO8601", iso_date);
+ g_warning ("failed to parse %s, falling back to ISO8601", iso_date);
text = g_strdup (iso_date);
goto out;
}
@@ -2064,12 +2062,12 @@ gpk_packages_treeview_clicked_cb (GtkTreeSelection *selection, gpointer user_dat
gtk_tree_model_get (model, &iter,
GPK_UPDATES_COLUMN_UPDATE_DETAIL_OBJ, &item,
GPK_UPDATES_COLUMN_ID, &package_id, -1);
- egg_debug ("selected row is: %s, %p", package_id, item);
+ g_debug ("selected row is: %s, %p", package_id, item);
g_free (package_id);
if (item != NULL)
gpk_update_viewer_populate_details (item);
} else {
- egg_debug ("no row selected");
+ g_debug ("no row selected");
}
}
@@ -2107,7 +2105,7 @@ gpk_update_viewer_get_details_cb (PkClient *client, GAsyncResult *res, gpointer
/* check error code */
error_code = pk_results_get_error_code (results);
if (error_code != NULL) {
- egg_warning ("failed to get details: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ g_warning ("failed to get details: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
window = GTK_WINDOW(gtk_builder_get_object (builder, "dialog_updates"));
gpk_error_dialog_modal (window, gpk_error_enum_to_localised_text (pk_error_get_code (error_code)),
@@ -2137,7 +2135,7 @@ gpk_update_viewer_get_details_cb (PkClient *client, GAsyncResult *res, gpointer
path = gpk_update_viewer_model_get_path (model, package_id);
if (path == NULL) {
- egg_debug ("not found ID for details");
+ g_debug ("not found ID for details");
} else {
gtk_tree_model_get_iter (model, &iter, path);
gtk_tree_path_free (path);
@@ -2205,7 +2203,7 @@ gpk_update_viewer_get_update_detail_cb (PkClient *client, GAsyncResult *res, gpo
/* check error code */
error_code = pk_results_get_error_code (results);
if (error_code != NULL) {
- egg_warning ("failed to get update details: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ g_warning ("failed to get update details: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
window = GTK_WINDOW(gtk_builder_get_object (builder, "dialog_updates"));
gpk_error_dialog_modal (window, gpk_error_enum_to_localised_text (pk_error_get_code (error_code)),
@@ -2235,7 +2233,7 @@ gpk_update_viewer_get_update_detail_cb (PkClient *client, GAsyncResult *res, gpo
path = gpk_update_viewer_model_get_path (model, package_id);
if (path == NULL) {
- egg_warning ("not found ID for update detail");
+ g_warning ("not found ID for update detail");
} else {
gtk_tree_model_get_iter (model, &iter, path);
gtk_tree_path_free (path);
@@ -2446,7 +2444,7 @@ gpk_update_viewer_detail_popup_menu_create (GtkWidget *treeview, GdkEventButton
/* we don't want to show 'Select all' if they are all checked */
ret = gpk_update_viewer_get_checked_status (&all_checked, &none_checked);
if (!ret) {
- egg_debug ("ignoring as we are locked down");
+ g_debug ("ignoring as we are locked down");
return;
}
@@ -2500,7 +2498,7 @@ gpk_update_viewer_detail_button_pressed (GtkWidget *treeview, GdkEventButton *ev
return FALSE;
}
- egg_debug ("Single right click on the tree view");
+ g_debug ("Single right click on the tree view");
/* select the row */
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(treeview));
@@ -2592,7 +2590,7 @@ gpk_update_viewer_get_updates_cb (PkClient *client, GAsyncResult *res, gpointer
/* check error code */
error_code = pk_results_get_error_code (results);
if (error_code != NULL) {
- egg_warning ("failed to get updates: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ g_warning ("failed to get updates: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
window = GTK_WINDOW(gtk_builder_get_object (builder, "dialog_updates"));
gpk_error_dialog_modal (window, gpk_error_enum_to_localised_text (pk_error_get_code (error_code)),
@@ -2634,7 +2632,7 @@ gpk_update_viewer_get_updates_cb (PkClient *client, GAsyncResult *res, gpointer
/* add to array store */
text = gpk_package_id_format_twoline (package_id, summary);
- egg_debug ("adding: id=%s, text=%s", package_id, text);
+ g_debug ("adding: id=%s, text=%s", package_id, text);
selected = (info != PK_INFO_ENUM_BLOCKED);
/* do we add to a parent? */
@@ -2731,7 +2729,7 @@ gpk_update_viewer_get_new_update_array (void)
/* only show newest updates? */
ret = g_settings_get_boolean (settings, GPK_SETTINGS_ONLY_NEWEST);
if (ret) {
- egg_debug ("only showing newest updates");
+ g_debug ("only showing newest updates");
filter = pk_bitfield_from_enums (PK_FILTER_ENUM_NEWEST, -1);
}
@@ -2914,9 +2912,9 @@ static void
gpk_update_viewer_updates_changed_cb (PkControl *_control, gpointer user_data)
{
/* now try to get newest update array */
- egg_debug ("updates changed");
+ g_debug ("updates changed");
if (ignore_updates_changed) {
- egg_debug ("ignoring");
+ g_debug ("ignoring");
return;
}
gpk_update_viewer_get_new_update_array ();
@@ -2930,7 +2928,7 @@ gpk_update_viewer_vpaned_realized_cb (GtkWidget *widget, gpointer user_data)
{
GtkRequisition req;
gtk_widget_get_preferred_size (widget, &req, NULL);
- egg_debug ("req.height=%i", req.height);
+ g_debug ("req.height=%i", req.height);
if (req.height != 0)
gtk_paned_set_position (GTK_PANED (widget), 166);
}
@@ -3019,7 +3017,7 @@ gpk_update_viewer_get_distro_upgrades_cb (PkClient *client, GAsyncResult *res, g
/* check error code */
error_code = pk_results_get_error_code (results);
if (error_code != NULL) {
- egg_warning ("failed to get list of distro upgrades: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ g_warning ("failed to get list of distro upgrades: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
window = GTK_WINDOW(gtk_builder_get_object (builder, "dialog_updates"));
gpk_error_dialog_modal (window, gpk_error_enum_to_localised_text (pk_error_get_code (error_code)),
@@ -3033,7 +3031,6 @@ gpk_update_viewer_get_distro_upgrades_cb (PkClient *client, GAsyncResult *res, g
if (item == NULL)
goto out;
-
/* get data */
g_object_get (item,
"summary", &summary,
@@ -3169,7 +3166,7 @@ gpk_update_viewer_application_startup_cb (GtkApplication *_application, gpointer
builder = gtk_builder_new ();
retval = gtk_builder_add_from_file (builder, GPK_DATA "/gpk-update-viewer.ui", &error);
if (retval == 0) {
- egg_warning ("failed to load ui: %s", error->message);
+ g_warning ("failed to load ui: %s", error->message);
g_error_free (error);
goto out;
}
@@ -3264,7 +3261,7 @@ gpk_update_viewer_application_startup_cb (GtkApplication *_application, gpointer
/* set a size, if the screen allows */
ret = gpk_window_set_size_request (GTK_WINDOW(main_window), 700, 600);
if (!ret) {
- egg_debug ("small form factor mode");
+ g_debug ("small form factor mode");
/* hide the header in SFF mode */
widget = GTK_WIDGET(gtk_builder_get_object (builder, "hbox_header"));
gtk_widget_hide (widget);
@@ -3344,7 +3341,7 @@ main (int argc, char *argv[])
context = g_option_context_new (NULL);
g_option_context_set_summary (context, _("Add/Remove Software"));
g_option_context_add_main_entries (context, options, NULL);
- g_option_context_add_group (context, egg_debug_get_option_group ());
+ g_option_context_add_group (context, gpk_debug_get_option_group ());
g_option_context_add_group (context, gtk_get_option_group (TRUE));
g_option_context_parse (context, &argc, &argv, NULL);
g_option_context_free (context);
diff --git a/src/gpk-vendor.c b/src/gpk-vendor.c
index 47a0bc8..0e20d04 100644
--- a/src/gpk-vendor.c
+++ b/src/gpk-vendor.c
@@ -23,7 +23,6 @@
#include <glib/gi18n.h>
-#include "egg-debug.h"
#include "egg-string.h"
#include "gpk-vendor.h"
@@ -95,7 +94,7 @@ gpk_vendor_get_not_found_url (GpkVendor *vendor, GpkVendorUrlType type)
goto out;
/* get fallback data */
- egg_debug ("using fallback");
+ g_debug ("using fallback");
key = gpk_vendor_type_to_string (GPK_VENDOR_URL_TYPE_DEFAULT);
url = g_key_file_get_string (vendor->priv->file, "PackagesNotFound", key, NULL);
@@ -105,7 +104,7 @@ gpk_vendor_get_not_found_url (GpkVendor *vendor, GpkVendorUrlType type)
url = NULL;
}
out:
- egg_debug ("url=%s", url);
+ g_debug ("url=%s", url);
return url;
}
@@ -123,7 +122,7 @@ gpk_vendor_init (GpkVendor *vendor)
vendor->priv->file = g_key_file_new ();
ret = g_key_file_load_from_file (vendor->priv->file, "/etc/PackageKit/Vendor.conf", G_KEY_FILE_NONE, NULL);
if (!ret)
- egg_warning ("file not found");
+ g_warning ("file not found");
}
/**
diff --git a/src/gpk-watch.c b/src/gpk-watch.c
index 3cff867..a39a179 100644
--- a/src/gpk-watch.c
+++ b/src/gpk-watch.c
@@ -38,7 +38,6 @@
#include <libnotify/notify.h>
#include <packagekit-glib2/packagekit.h>
-#include "egg-debug.h"
#include "egg-string.h"
#include "egg-console-kit.h"
@@ -100,7 +99,7 @@ gpk_watch_libnotify_cb (NotifyNotification *notification, gchar *action, gpointe
GpkWatch *watch = GPK_WATCH (data);
if (g_strcmp0 (action, "do-not-show-notify-complete") == 0) {
- egg_debug ("set %s to FALSE", GPK_SETTINGS_NOTIFY_COMPLETED);
+ g_debug ("set %s to FALSE", GPK_SETTINGS_NOTIFY_COMPLETED);
g_settings_set_boolean (watch->priv->settings, GPK_SETTINGS_NOTIFY_COMPLETED, FALSE);
} else if (g_strcmp0 (action, "show-error-details") == 0) {
@@ -118,12 +117,12 @@ gpk_watch_libnotify_cb (NotifyNotification *notification, gchar *action, gpointe
/* restart using ConsoleKit */
ret = egg_console_kit_restart (watch->priv->console, &error);
if (!ret) {
- egg_warning ("restarting failed: %s", error->message);
+ g_warning ("restarting failed: %s", error->message);
g_error_free (error);
}
} else {
- egg_warning ("unknown action id: %s", action);
+ g_warning ("unknown action id: %s", action);
}
}
@@ -173,13 +172,13 @@ gpk_watch_get_proxy_ftp (GpkWatch *watch)
/* common case, a direct connection */
mode = g_settings_get_string (watch->priv->settings, "/system/proxy/mode");
if (g_strcmp0 (mode, "none") == 0) {
- egg_debug ("not using session proxy");
+ g_debug ("not using session proxy");
goto out;
}
host = g_settings_get_string (watch->priv->settings, "/system/proxy/ftp_host");
if (egg_strzero (host)) {
- egg_debug ("no hostname for ftp proxy");
+ g_debug ("no hostname for ftp proxy");
goto out;
}
port = g_settings_get_int (watch->priv->settings, "/system/proxy/ftp_port");
@@ -217,21 +216,21 @@ gpk_watch_get_proxy_http (GpkWatch *watch)
/* common case, a direct connection */
mode = g_settings_get_string (watch->priv->settings, "/system/proxy/mode");
if (g_strcmp0 (mode, "none") == 0) {
- egg_debug ("not using session proxy");
+ g_debug ("not using session proxy");
goto out;
}
/* do we use this? */
ret = g_settings_get_boolean (watch->priv->settings, "/system/http_proxy/use_http_proxy");
if (!ret) {
- egg_debug ("not using http proxy");
+ g_debug ("not using http proxy");
goto out;
}
/* http has 4 parameters */
host = g_settings_get_string (watch->priv->settings, "/system/http_proxy/host");
if (egg_strzero (host)) {
- egg_debug ("no hostname for http proxy");
+ g_debug ("no hostname for http proxy");
goto out;
}
@@ -292,7 +291,7 @@ gpk_watch_set_proxy_cb (GObject *object, GAsyncResult *res, GpkWatch *watch)
/* get the result */
ret = pk_control_set_proxy_finish (control, res, &error);
if (!ret) {
- egg_warning ("failed to set proxies: %s", error->message);
+ g_warning ("failed to set proxies: %s", error->message);
g_error_free (error);
return;
}
@@ -308,12 +307,12 @@ gpk_watch_set_proxies_ratelimit (GpkWatch *watch)
gchar *proxy_ftp;
/* debug so we can catch polling */
- egg_debug ("polling check");
+ g_debug ("polling check");
proxy_http = gpk_watch_get_proxy_http (watch);
proxy_ftp = gpk_watch_get_proxy_ftp (watch);
- egg_debug ("set proxy_http=%s, proxy_ftp=%s", proxy_http, proxy_ftp);
+ g_debug ("set proxy_http=%s, proxy_ftp=%s", proxy_http, proxy_ftp);
pk_control_set_proxy_async (watch->priv->control, proxy_http, proxy_ftp, watch->priv->cancellable,
(GAsyncReadyCallback) gpk_watch_set_proxy_cb, watch);
g_free (proxy_http);
@@ -328,7 +327,7 @@ static gboolean
gpk_watch_set_proxies (GpkWatch *watch)
{
if (watch->priv->set_proxy_id != 0) {
- egg_debug ("already scheduled");
+ g_debug ("already scheduled");
return FALSE;
}
watch->priv->set_proxy_id = g_timeout_add (GPK_WATCH_SET_PROXY_RATE_LIMIT,
@@ -351,7 +350,7 @@ gpk_watch_set_root_cb (GObject *object, GAsyncResult *res, GpkWatch *watch)
/* get the result */
ret = pk_control_set_root_finish (control, res, &error);
if (!ret) {
- egg_warning ("failed to set install root: %s", error->message);
+ g_warning ("failed to set install root: %s", error->message);
g_error_free (error);
return;
}
@@ -368,7 +367,7 @@ gpk_watch_set_root (GpkWatch *watch)
/* get install root */
root = g_settings_get_string (watch->priv->settings, GPK_SETTINGS_INSTALL_ROOT);
if (root == NULL) {
- egg_warning ("could not read install root");
+ g_warning ("could not read install root");
goto out;
}
@@ -389,7 +388,7 @@ static void gpk_watch_set_root (GpkWatch *watch) {}
static void
gpk_watch_key_changed_cb (GSettings *client, const gchar *key, GpkWatch *watch)
{
- egg_debug ("keys have changed");
+ g_debug ("keys have changed");
gpk_watch_set_proxies (watch);
gpk_watch_set_root (watch);
}
@@ -404,7 +403,7 @@ gpk_watch_set_connected (GpkWatch *watch, gboolean connected)
return;
/* daemon has just appeared */
- egg_debug ("dameon has just appeared");
+ g_debug ("dameon has just appeared");
gpk_watch_set_proxies (watch);
gpk_watch_set_root (watch);
}
@@ -449,13 +448,13 @@ gpk_watch_is_message_ignored (GpkWatch *watch, PkMessageEnum message)
/* get from settings */
ignored_str = g_settings_get_string (watch->priv->settings, GPK_SETTINGS_IGNORED_MESSAGES);
if (ignored_str == NULL) {
- egg_warning ("could not read ignored list");
+ g_warning ("could not read ignored list");
goto out;
}
/* nothing in list, common case */
if (egg_strzero (ignored_str)) {
- egg_debug ("nothing in ignored list");
+ g_debug ("nothing in ignored list");
goto out;
}
@@ -467,7 +466,7 @@ gpk_watch_is_message_ignored (GpkWatch *watch, PkMessageEnum message)
for (i=0; ignored[i] != NULL; i++) {
ret = g_pattern_match_simple (ignored[i], message_str);
if (ret) {
- egg_debug ("match %s for %s, ignoring", ignored[i], message_str);
+ g_debug ("match %s for %s, ignoring", ignored[i], message_str);
break;
}
}
@@ -500,14 +499,14 @@ gpk_watch_process_messages_cb (PkMessage *item, GpkWatch *watch)
/* this is message unrecognised */
if (gpk_message_enum_to_localised_text (type) == NULL) {
- egg_warning ("message unrecognized, and thus ignored: %i", type);
+ g_warning ("message unrecognized, and thus ignored: %i", type);
goto out;
}
/* is ignored */
ret = gpk_watch_is_message_ignored (watch, type);
if (ret) {
- egg_debug ("ignoring message");
+ g_debug ("ignoring message");
goto out;
}
@@ -515,7 +514,7 @@ gpk_watch_process_messages_cb (PkMessage *item, GpkWatch *watch)
if (watch->priv->notification_message != NULL) {
ret = notify_notification_close (watch->priv->notification_message, &error);
if (!ret) {
- egg_warning ("error: %s", error->message);
+ g_warning ("error: %s", error->message);
g_clear_error (&error);
}
}
@@ -523,7 +522,7 @@ gpk_watch_process_messages_cb (PkMessage *item, GpkWatch *watch)
/* are we accepting notifications */
value = g_settings_get_boolean (watch->priv->settings, GPK_SETTINGS_NOTIFY_MESSAGE);
if (!value) {
- egg_debug ("not showing notification as prevented in settings");
+ g_debug ("not showing notification as prevented in settings");
goto out;
}
@@ -535,7 +534,7 @@ gpk_watch_process_messages_cb (PkMessage *item, GpkWatch *watch)
notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
ret = notify_notification_show (notification, &error);
if (!ret) {
- egg_warning ("error: %s", error->message);
+ g_warning ("error: %s", error->message);
g_error_free (error);
}
watch->priv->notification_message = notification;
@@ -568,14 +567,14 @@ gpk_watch_process_error_code (GpkWatch *watch, PkError *error_code)
code == PK_ERROR_ENUM_NO_NETWORK ||
code == PK_ERROR_ENUM_PROCESS_KILL ||
code == PK_ERROR_ENUM_TRANSACTION_CANCELLED) {
- egg_debug ("error ignored %s%s", title, pk_error_get_details (error_code));
+ g_debug ("error ignored %s%s", title, pk_error_get_details (error_code));
goto out;
}
/* are we accepting notifications */
value = g_settings_get_boolean (watch->priv->settings, GPK_SETTINGS_NOTIFY_ERROR);
if (!value) {
- egg_debug ("not showing notification as prevented in settings");
+ g_debug ("not showing notification as prevented in settings");
goto out;
}
@@ -599,7 +598,7 @@ gpk_watch_process_error_code (GpkWatch *watch, PkError *error_code)
ret = notify_notification_show (notification, &error);
if (!ret) {
- egg_warning ("error: %s", error->message);
+ g_warning ("error: %s", error->message);
g_error_free (error);
}
out:
@@ -634,7 +633,7 @@ gpk_watch_process_require_restart_cb (PkRequireRestart *item, GpkWatch *watch)
/* if less important than what we are already showing */
if (restart <= watch->priv->restart) {
- egg_debug ("restart already %s, not processing %s",
+ g_debug ("restart already %s, not processing %s",
pk_restart_enum_to_text (watch->priv->restart),
pk_restart_enum_to_text (restart));
goto out;
@@ -649,7 +648,7 @@ gpk_watch_process_require_restart_cb (PkRequireRestart *item, GpkWatch *watch)
for (i=0; i<names->len; i++) {
name = g_ptr_array_index (names, i);
if (g_strcmp0 (name, split[PK_PACKAGE_ID_NAME]) == 0) {
- egg_debug ("already got %s", name);
+ g_debug ("already got %s", name);
goto out;
}
}
@@ -663,7 +662,7 @@ gpk_watch_process_require_restart_cb (PkRequireRestart *item, GpkWatch *watch)
if (watch->priv->notification_restart != NULL) {
ret = notify_notification_close (watch->priv->notification_restart, &error);
if (!ret) {
- egg_warning ("error: %s", error->message);
+ g_warning ("error: %s", error->message);
g_clear_error (&error);
}
}
@@ -685,17 +684,17 @@ gpk_watch_process_require_restart_cb (PkRequireRestart *item, GpkWatch *watch)
/* TRANSLATORS: restart the computer */
_("Restart"), gpk_watch_libnotify_cb, watch, NULL);
} else {
- egg_warning ("failed to handle restart action: %s", pk_restart_enum_to_string (restart));
+ g_warning ("failed to handle restart action: %s", pk_restart_enum_to_string (restart));
}
ret = notify_notification_show (notification, &error);
if (!ret) {
- egg_warning ("error: %s", error->message);
+ g_warning ("error: %s", error->message);
g_error_free (error);
}
watch->priv->notification_restart = notification;
/* add to list */
- egg_debug ("adding %s to restart list", split[PK_PACKAGE_ID_NAME]);
+ g_debug ("adding %s to restart list", split[PK_PACKAGE_ID_NAME]);
g_ptr_array_add (names, g_strdup (split[PK_PACKAGE_ID_NAME]));
out:
g_free (package_id);
@@ -726,7 +725,7 @@ gpk_watch_adopt_cb (PkClient *client, GAsyncResult *res, GpkWatch *watch)
/* get the results */
results = pk_client_generic_finish (client, res, &error);
if (results == NULL) {
- egg_warning ("failed to adopt: %s", error->message);
+ g_warning ("failed to adopt: %s", error->message);
g_error_free (error);
goto out;
}
@@ -744,7 +743,7 @@ gpk_watch_adopt_cb (PkClient *client, GAsyncResult *res, GpkWatch *watch)
"elapsed-time", &elapsed_time,
NULL);
- egg_debug ("%s finished (%s)", transaction_id, pk_role_enum_to_text (role));
+ g_debug ("%s finished (%s)", transaction_id, pk_role_enum_to_text (role));
/* get the error */
error_code = pk_results_get_error_code (results);
@@ -770,19 +769,19 @@ gpk_watch_adopt_cb (PkClient *client, GAsyncResult *res, GpkWatch *watch)
/* are we accepting notifications */
ret = g_settings_get_boolean (watch->priv->settings, GPK_SETTINGS_NOTIFY_COMPLETED);
if (!ret) {
- egg_debug ("not showing notification as prevented in settings");
+ g_debug ("not showing notification as prevented in settings");
goto out;
}
/* is it worth showing a UI? */
if (elapsed_time < 3000) {
- egg_debug ("no notification, too quick");
+ g_debug ("no notification, too quick");
goto out;
}
/* is caller able to handle the messages itself? */
if (caller_active) {
- egg_debug ("not showing notification as caller is still present");
+ g_debug ("not showing notification as caller is still present");
goto out;
}
@@ -809,7 +808,7 @@ gpk_watch_adopt_cb (PkClient *client, GAsyncResult *res, GpkWatch *watch)
_("Do not show this again"), gpk_watch_libnotify_cb, watch, NULL);
ret = notify_notification_show (notification, &error);
if (!ret) {
- egg_warning ("error: %s", error->message);
+ g_warning ("error: %s", error->message);
g_error_free (error);
}
out:
@@ -842,7 +841,7 @@ gpk_watch_progress_cb (PkProgress *progress, PkProgressType type, GpkWatch *watc
ret = TRUE;
}
if (!ret) {
- egg_debug ("adding progress %p", progress);
+ g_debug ("adding progress %p", progress);
g_ptr_array_add (array, g_object_ref (progress));
}
g_free (text);
@@ -859,10 +858,10 @@ gpk_watch_transaction_list_added_cb (PkTransactionList *tlist, const gchar *tran
/* find progress */
progress = gpk_watch_lookup_progress_from_transaction_id (watch, transaction_id);
if (progress != NULL) {
- egg_warning ("already added: %s", transaction_id);
+ g_warning ("already added: %s", transaction_id);
return;
}
- egg_debug ("added: %s", transaction_id);
+ g_debug ("added: %s", transaction_id);
pk_client_adopt_async (PK_CLIENT(watch->priv->task), transaction_id, watch->priv->cancellable,
(PkProgressCallback) gpk_watch_progress_cb, watch,
(GAsyncReadyCallback) gpk_watch_adopt_cb, watch);
@@ -879,10 +878,10 @@ gpk_watch_transaction_list_removed_cb (PkTransactionList *tlist, const gchar *tr
/* find progress */
progress = gpk_watch_lookup_progress_from_transaction_id (watch, transaction_id);
if (progress == NULL) {
- egg_warning ("could not find: %s", transaction_id);
+ g_warning ("could not find: %s", transaction_id);
return;
}
- egg_debug ("removed: %s", transaction_id);
+ g_debug ("removed: %s", transaction_id);
g_ptr_array_remove_fast (watch->priv->array_progress, progress);
}
@@ -901,7 +900,7 @@ gpk_check_update_get_properties_cb (GObject *object, GAsyncResult *res, GpkWatch
ret = pk_control_get_properties_finish (control, res, &error);
if (!ret) {
/* TRANSLATORS: backend is broken, and won't tell us what it supports */
- egg_warning ("details could not be retrieved: %s", error->message);
+ g_warning ("details could not be retrieved: %s", error->message);
g_error_free (error);
goto out;
}
diff --git a/src/gpk-x11.c b/src/gpk-x11.c
index 571b286..46fddef 100644
--- a/src/gpk-x11.c
+++ b/src/gpk-x11.c
@@ -26,7 +26,6 @@
#include <gdk/gdkx.h>
#include <X11/Xatom.h>
-#include "egg-debug.h"
#include "egg-string.h"
#include "gpk-x11.h"
@@ -98,7 +97,7 @@ gpk_x11_get_user_time (GpkX11 *x11)
/* check we have a window */
if (x11->priv->window == None) {
- egg_debug ("no window, so cannot get user_time");
+ g_debug ("no window, so cannot get user_time");
goto out;
}
@@ -109,13 +108,13 @@ gpk_x11_get_user_time (GpkX11 *x11)
&type, &format, &nitems, &bytes_after, (void*) &win);
err = gdk_error_trap_pop ();
if (err != Success || rc != Success) {
- egg_warning ("couldn't get _NET_WM_USER_TIME_WINDOW");
+ g_warning ("couldn't get _NET_WM_USER_TIME_WINDOW");
goto out;
}
/* is not a window */
if (type != XA_WINDOW) {
- egg_warning ("not type XA_WINDOW");
+ g_warning ("not type XA_WINDOW");
goto out;
}
@@ -126,13 +125,13 @@ gpk_x11_get_user_time (GpkX11 *x11)
&type, &format, &nitems, &bytes_after, (void*) ×tamp);
err = gdk_error_trap_pop ();
if (err != Success || rc != Success) {
- egg_warning ("couldn't get _NET_WM_USER_TIME");
+ g_warning ("couldn't get _NET_WM_USER_TIME");
goto out;
}
/* is not a window */
if (type != XA_CARDINAL) {
- egg_warning ("not type XA_CARDINAL");
+ g_warning ("not type XA_CARDINAL");
goto out;
}
out:
@@ -161,7 +160,7 @@ gpk_x11_get_title (GpkX11 *x11)
/* check we have a window */
if (x11->priv->window == None) {
- egg_debug ("no window, so cannot get user_time");
+ g_debug ("no window, so cannot get user_time");
goto out;
}
@@ -186,7 +185,7 @@ gpk_x11_get_title (GpkX11 *x11)
title = g_strdup (data);
goto out;
}
- egg_warning ("failed to get X11 name for window %i", (gint) x11->priv->window);
+ g_warning ("failed to get X11 name for window %i", (gint) x11->priv->window);
out:
if (data != NULL)
XFree (data);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
