[Goodies-commits] r5731 - xfce4-power-manager/trunk/src
Ali Abdallah
aliov at xfce.org
Tue Oct 21 11:23:37 CEST 2008
Author: aliov
Date: 2008-10-21 09:23:37 +0000 (Tue, 21 Oct 2008)
New Revision: 5731
Modified:
xfce4-power-manager/trunk/src/xfpm-battery.c
xfce4-power-manager/trunk/src/xfpm-button.c
xfce4-power-manager/trunk/src/xfpm-cpu.c
xfce4-power-manager/trunk/src/xfpm-dpms.c
xfce4-power-manager/trunk/src/xfpm-driver.c
xfce4-power-manager/trunk/src/xfpm-lcd-brightness.c
Log:
remove multiple call to xfconf_init followed by xfconf_shutdown
Modified: xfce4-power-manager/trunk/src/xfpm-battery.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-battery.c 2008-10-21 07:52:46 UTC (rev 5730)
+++ xfce4-power-manager/trunk/src/xfpm-battery.c 2008-10-21 09:23:37 UTC (rev 5731)
@@ -543,20 +543,6 @@
xfpm_battery_load_config(XfpmBattery *batt)
{
XFPM_DEBUG("loading configuration\n");
- GError *g_error = NULL;
- if ( !xfconf_init(&g_error) )
- {
- g_critical("xfconf init failed: %s\n",g_error->message);
- XFPM_DEBUG("Using default values\n");
- g_error_free(g_error);
- batt->critical_level = 10;
- batt->critical_action = XFPM_DO_NOTHING;
-#ifdef HAVE_LIBNOTIFY
- batt->notify_enabled = TRUE;
-#endif
- batt->show_tray = ALWAYS;
- return;
- }
XfconfChannel *channel;
channel = xfconf_channel_new(XFPM_CHANNEL_CFG);
@@ -568,7 +554,6 @@
batt->notify_enabled = xfconf_channel_get_bool(channel,BATT_STATE_NOTIFICATION_CFG,TRUE);
#endif
g_object_unref(channel);
- xfconf_shutdown();
}
static void
Modified: xfce4-power-manager/trunk/src/xfpm-button.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-button.c 2008-10-21 07:52:46 UTC (rev 5730)
+++ xfce4-power-manager/trunk/src/xfpm-button.c 2008-10-21 09:23:37 UTC (rev 5731)
@@ -489,17 +489,6 @@
{
XFPM_DEBUG("Loading configuration\n");
- GError *g_error = NULL;
- if ( !xfconf_init(&g_error) )
- {
- g_critical("xfconf init failed: %s\n",g_error->message);
- XFPM_DEBUG("Using default values\n");
- g_error_free(g_error);
- bt->lid_action = XFPM_DO_NOTHING;
- bt->sleep_action = XFPM_DO_NOTHING;
- bt->power_action = XFPM_DO_NOTHING;
- return;
- }
XfconfChannel *channel;
channel = xfconf_channel_new(XFPM_CHANNEL_CFG);
@@ -509,7 +498,6 @@
bt->power_action = xfconf_channel_get_uint(channel,POWER_SWITCH_CFG,XFPM_DO_NOTHING);
g_object_unref(channel);
- xfconf_shutdown();
}
static void
Modified: xfce4-power-manager/trunk/src/xfpm-cpu.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-cpu.c 2008-10-21 07:52:46 UTC (rev 5730)
+++ xfce4-power-manager/trunk/src/xfpm-cpu.c 2008-10-21 09:23:37 UTC (rev 5731)
@@ -239,18 +239,6 @@
XFPM_DEBUG("loading configuration\n");
XfconfChannel *channel;
- GError *g_error = NULL;
- if ( !xfconf_init(&g_error) )
- {
- g_critical("xfconf init failed: %s\n",g_error->message);
- XFPM_DEBUG("Using default values\n");
- g_error_free(g_error);
- cpu->on_ac_cpu_gov = ONDEMAND;
- cpu->on_batt_cpu_gov = POWERSAVE;
- cpu->cpu_freq_enabled = TRUE;
- return;
- }
-
channel = xfconf_channel_new(XFPM_CHANNEL_CFG);
cpu->on_ac_cpu_gov = xfconf_channel_get_uint(channel,ON_AC_CPU_GOV_CFG,ONDEMAND);
@@ -258,7 +246,6 @@
cpu->cpu_freq_enabled = xfconf_channel_get_bool(channel,CPU_FREQ_SCALING_CFG,TRUE);
g_object_unref(channel);
- xfconf_shutdown();
}
Modified: xfce4-power-manager/trunk/src/xfpm-dpms.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-dpms.c 2008-10-21 07:52:46 UTC (rev 5730)
+++ xfce4-power-manager/trunk/src/xfpm-dpms.c 2008-10-21 09:23:37 UTC (rev 5731)
@@ -214,22 +214,6 @@
XFPM_DEBUG("loading configuration\n");
XfconfChannel *channel;
- GError *g_error = NULL;
- if ( !xfconf_init(&g_error) )
- {
- g_critical("xfconf init failed: %s\n",g_error->message);
- XFPM_DEBUG("Using default values\n");
- g_error_free(g_error);
- dpms->on_ac_standby_timeout = 1800;
- dpms->on_ac_suspend_timeout = 2700;
- dpms->on_ac_off_timeout = 3600;
- dpms->on_batt_standby_timeout = 180;
- dpms->on_batt_suspend_timeout = 240;
- dpms->on_batt_off_timeout = 300;
- dpms->dpms_enabled = TRUE;
- return;
- }
-
channel = xfconf_channel_new(XFPM_CHANNEL_CFG);
GPtrArray *arr;
@@ -276,7 +260,6 @@
dpms->dpms_enabled = xfconf_channel_get_bool(channel,DPMS_ENABLE_CFG,TRUE);
g_object_unref(channel);
- xfconf_shutdown();
}
static gboolean
Modified: xfce4-power-manager/trunk/src/xfpm-driver.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-driver.c 2008-10-21 07:52:46 UTC (rev 5730)
+++ xfce4-power-manager/trunk/src/xfpm-driver.c 2008-10-21 09:23:37 UTC (rev 5731)
@@ -363,7 +363,6 @@
XfconfChannel *channel = (XfconfChannel *)data;
g_object_unref(channel);
}
- xfconf_shutdown();
}
@@ -552,12 +551,6 @@
GError *g_error = NULL;
gboolean with_dpms;
- if ( !xfconf_init(&g_error) )
- {
- g_critical("Unable to xfconf init failed: %s\n",g_error->message);
- g_error_free(g_error);
- g_error = NULL;
- }
channel = xfconf_channel_new(XFPM_CHANNEL_CFG);
g_object_set_data(G_OBJECT(drv),"conf-channel",channel);
@@ -858,18 +851,6 @@
XFPM_DEBUG("Loading configuration\n");
- GError *g_error = NULL;
- if ( !xfconf_init(&g_error) )
- {
- g_critical("xfconf init failed: %s\n",g_error->message);
- XFPM_DEBUG("Using default values\n");
- g_error_free(g_error);
-#ifdef HAVE_LIBNOTIFY
- priv->show_power_management_error = TRUE;
-#endif
- priv->enable_power_save = FALSE;
- return;
- }
XfconfChannel *channel;
channel = xfconf_channel_new(XFPM_CHANNEL_CFG);
@@ -880,8 +861,6 @@
priv->enable_power_save = xfconf_channel_get_bool(channel,POWER_SAVE_CFG,FALSE);
g_object_unref(channel);
- xfconf_shutdown();
-
}
#ifdef HAVE_LIBNOTIFY
@@ -890,20 +869,12 @@
{
if (strcmp(action,"confirmed")) return;
- GError *g_error = NULL;
- if ( !xfconf_init(&g_error) )
- {
- g_critical("xfconf init failed: %s\n",g_error->message);
- g_error_free(g_error);
- return;
- }
XfconfChannel *channel;
channel = xfconf_channel_new(XFPM_CHANNEL_CFG);
xfconf_channel_set_bool(channel,SHOW_POWER_MANAGEMENT_ERROR,FALSE);
g_object_unref(channel);
- xfconf_shutdown();
g_object_unref(n);
}
#endif
@@ -1200,6 +1171,16 @@
return FALSE;
}
+ GError *g_error = NULL;
+ if ( !xfconf_init(&g_error) )
+ {
+ g_critical("xfconf init failed: %s using default settings\n",g_error->message);
+ xfpm_popup_message(_("Xfce4 Power Manager"),_("Failed to load power manager configuration "\
+ "using defaults"),GTK_MESSAGE_WARNING);
+ g_error_free(g_error);
+
+ }
+
xfpm_driver_load_config(drv);
_get_system_form_factor(priv);
@@ -1210,6 +1191,7 @@
g_main_loop_run(priv->loop);
dbus_connection_remove_filter(priv->conn,xfpm_driver_signal_filter,NULL);
+ xfconf_shutdown();
return TRUE;
}
Modified: xfce4-power-manager/trunk/src/xfpm-lcd-brightness.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-lcd-brightness.c 2008-10-21 07:52:46 UTC (rev 5730)
+++ xfce4-power-manager/trunk/src/xfpm-lcd-brightness.c 2008-10-21 09:23:37 UTC (rev 5731)
@@ -288,15 +288,6 @@
static void xfpm_lcd_brightness_load_config(XfpmLcdBrightness *lcd)
{
XFPM_DEBUG("Loading configuration\n");
- GError *g_error = NULL;
- if ( !xfconf_init(&g_error) )
- {
- g_critical("xfconf init failed: %s\n",g_error->message);
- XFPM_DEBUG("Using default values\n");
- g_error_free(g_error);
- lcd->brightness_control_enabled = TRUE;
- return;
- }
XfconfChannel *channel;
channel = xfconf_channel_new(XFPM_CHANNEL_CFG);
@@ -304,7 +295,6 @@
lcd->brightness_control_enabled = xfconf_channel_get_bool(channel,LCD_BRIGHTNESS_CFG,TRUE);
g_object_unref(channel);
- xfconf_shutdown();
}
static void
More information about the Goodies-commits
mailing list