[Goodies-commits] r7848 - in xfce4-power-manager/trunk: . data/interfaces libxfpm po settings src
Ali Abdallah
aliov at xfce.org
Mon Jul 27 08:50:10 CEST 2009
Author: aliov
Date: 2009-07-27 06:50:10 +0000 (Mon, 27 Jul 2009)
New Revision: 7848
Modified:
xfce4-power-manager/trunk/ChangeLog
xfce4-power-manager/trunk/NEWS
xfce4-power-manager/trunk/data/interfaces/xfpm-settings.ui
xfce4-power-manager/trunk/libxfpm/xfpm-common.c
xfce4-power-manager/trunk/po/xfce4-power-manager.pot
xfce4-power-manager/trunk/settings/xfpm-settings.c
xfce4-power-manager/trunk/src/xfpm-battery.c
xfce4-power-manager/trunk/src/xfpm-engine.c
xfce4-power-manager/trunk/src/xfpm-enum-glib.h
xfce4-power-manager/trunk/src/xfpm-main.c
xfce4-power-manager/trunk/src/xfpm-manager.c
xfce4-power-manager/trunk/src/xfpm-session.c
xfce4-power-manager/trunk/src/xfpm-shutdown.c
xfce4-power-manager/trunk/src/xfpm-xfconf.c
Log:
* src/xfpm-battery.c don't notify when starting up.
* src/xfpm-engine.c fix a typo output message.
* src/xfpm-session.c Add error checking for getting DBus connection.
* src/xfpm-shutdown.c more verbosity.
* src/xfpm-main.c don't exit on SIGHUP.
* src/xfpm-manager.c exits if we fail to get primary name owner
of org.freedesktop.PowerManagement.
* libxfpm/xfpm-common.c use xdg-open first to open links.
* Another patch to the interface file by Josef Havran.
* Add the possibility to don't show a tray icon bug 5613.
Modified: xfce4-power-manager/trunk/ChangeLog
===================================================================
--- xfce4-power-manager/trunk/ChangeLog 2009-07-26 23:00:54 UTC (rev 7847)
+++ xfce4-power-manager/trunk/ChangeLog 2009-07-27 06:50:10 UTC (rev 7848)
@@ -1,3 +1,15 @@
+2009-07-27: Ali aliov at xfce.org
+ * src/xfpm-battery.c don't notify when starting up.
+ * src/xfpm-engine.c fix a typo output message.
+ * src/xfpm-session.c Add error checking for getting DBus connection.
+ * src/xfpm-shutdown.c more verbosity.
+ * src/xfpm-main.c don't exit on SIGHUP.
+ * src/xfpm-manager.c exits if we fail to get primary name owner
+ of org.freedesktop.PowerManagement.
+ * libxfpm/xfpm-common.c use xdg-open first to open links.
+ * Another patch to the interface file by Josef Havran.
+ * Add the possibility to don't show a tray icon bug 5613.
+
2009-07-24: Ali aliov at xfce.org
* Better alignement in the interface file, worked by Josef Havran.
Modified: xfce4-power-manager/trunk/NEWS
===================================================================
--- xfce4-power-manager/trunk/NEWS 2009-07-26 23:00:54 UTC (rev 7847)
+++ xfce4-power-manager/trunk/NEWS 2009-07-27 06:50:10 UTC (rev 7848)
@@ -1,4 +1,4 @@
Current
=======
- Make it possible to compile without network manager support.
--
+- Add never show icon to the system tray configuration (bug #5613).
Modified: xfce4-power-manager/trunk/data/interfaces/xfpm-settings.ui
===================================================================
--- xfce4-power-manager/trunk/data/interfaces/xfpm-settings.ui 2009-07-26 23:00:54 UTC (rev 7847)
+++ xfce4-power-manager/trunk/data/interfaces/xfpm-settings.ui 2009-07-27 06:50:10 UTC (rev 7848)
@@ -69,17 +69,6 @@
</row>
</data>
</object>
- <object class="GtkListStore" id="model2">
- <columns>
- <!-- column-name gchararray -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">Always show icon</col>
- </row>
- </data>
- </object>
<object class="GtkListStore" id="model3">
<columns>
<!-- column-name gchararray -->
@@ -177,10 +166,8 @@
<property name="show_tabs">False</property>
<property name="show_border">False</property>
<child>
- <object class="GtkNotebook" id="general">
+ <object class="GtkViewport" id="general">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="show_tabs">False</property>
<child>
<object class="GtkFrame" id="frame">
<property name="visible">True</property>
@@ -190,7 +177,6 @@
<child>
<object class="GtkAlignment" id="alignment">
<property name="visible">True</property>
- <property name="top_padding">3</property>
<property name="left_padding">12</property>
<property name="right_padding">6</property>
<child>
@@ -300,7 +286,6 @@
<child>
<object class="GtkComboBox" id="tray-combox">
<property name="visible">True</property>
- <property name="model">model2</property>
<signal name="changed" handler="set_show_tray_icon_cb"/>
<child>
<object class="GtkCellRendererText" id="renderer2"/>
@@ -375,9 +360,6 @@
</child>
</object>
</child>
- <child type="tab">
- <placeholder/>
- </child>
</object>
</child>
<child type="tab">
@@ -449,7 +431,7 @@
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<property name="orientation">vertical</property>
- <property name="spacing">2</property>
+ <property name="spacing">4</property>
<child>
<object class="GtkLabel" id="label9">
<property name="visible">True</property>
@@ -477,7 +459,6 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="padding">6</property>
<property name="position">1</property>
</packing>
</child>
@@ -514,7 +495,7 @@
<property name="visible">True</property>
<property name="border_width">12</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkFrame" id="dpms-on-ac-frame">
<property name="label_xalign">0</property>
@@ -522,20 +503,19 @@
<child>
<object class="GtkAlignment" id="alignment10">
<property name="visible">True</property>
- <property name="top_padding">12</property>
- <property name="bottom_padding">6</property>
+ <property name="top_padding">6</property>
<property name="left_padding">12</property>
<property name="right_padding">6</property>
<child>
<object class="GtkVBox" id="vbox20">
<property name="visible">True</property>
<property name="orientation">vertical</property>
- <property name="spacing">12</property>
+ <property name="spacing">6</property>
<child>
<object class="GtkVBox" id="vbox21">
<property name="visible">True</property>
<property name="orientation">vertical</property>
- <property name="spacing">2</property>
+ <property name="spacing">4</property>
<child>
<object class="GtkLabel" id="label28">
<property name="visible">True</property>
@@ -571,7 +551,7 @@
<object class="GtkVBox" id="vbox22">
<property name="visible">True</property>
<property name="orientation">vertical</property>
- <property name="spacing">2</property>
+ <property name="spacing">4</property>
<child>
<object class="GtkLabel" id="label29">
<property name="visible">True</property>
@@ -628,14 +608,14 @@
<child>
<object class="GtkAlignment" id="alignment11">
<property name="visible">True</property>
- <property name="top_padding">12</property>
+ <property name="top_padding">6</property>
<property name="left_padding">12</property>
<property name="right_padding">6</property>
<child>
<object class="GtkVBox" id="vbox23">
<property name="visible">True</property>
<property name="orientation">vertical</property>
- <property name="spacing">2</property>
+ <property name="spacing">4</property>
<child>
<object class="GtkLabel" id="label31">
<property name="visible">True</property>
@@ -824,7 +804,7 @@
<object class="GtkVBox" id="vbox4">
<property name="visible">True</property>
<property name="orientation">vertical</property>
- <property name="spacing">2</property>
+ <property name="spacing">4</property>
<child>
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
@@ -851,7 +831,6 @@
</child>
</object>
<packing>
- <property name="padding">6</property>
<property name="position">2</property>
</packing>
</child>
@@ -888,7 +867,7 @@
<property name="visible">True</property>
<property name="border_width">12</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkFrame" id="dpms-on-battery-frame">
<property name="label_xalign">0</property>
@@ -896,20 +875,19 @@
<child>
<object class="GtkAlignment" id="alignment13">
<property name="visible">True</property>
- <property name="top_padding">12</property>
- <property name="bottom_padding">6</property>
+ <property name="top_padding">6</property>
<property name="left_padding">12</property>
<property name="right_padding">6</property>
<child>
<object class="GtkVBox" id="vbox27">
<property name="visible">True</property>
<property name="orientation">vertical</property>
- <property name="spacing">12</property>
+ <property name="spacing">6</property>
<child>
<object class="GtkVBox" id="vbox28">
<property name="visible">True</property>
<property name="orientation">vertical</property>
- <property name="spacing">2</property>
+ <property name="spacing">4</property>
<child>
<object class="GtkLabel" id="label36">
<property name="visible">True</property>
@@ -947,7 +925,7 @@
<object class="GtkVBox" id="vbox29">
<property name="visible">True</property>
<property name="orientation">vertical</property>
- <property name="spacing">2</property>
+ <property name="spacing">4</property>
<child>
<object class="GtkLabel" id="label37">
<property name="visible">True</property>
@@ -1006,14 +984,14 @@
<child>
<object class="GtkAlignment" id="alignment14">
<property name="visible">True</property>
- <property name="top_padding">12</property>
+ <property name="top_padding">6</property>
<property name="left_padding">12</property>
<property name="right_padding">6</property>
<child>
<object class="GtkVBox" id="vbox30">
<property name="visible">True</property>
<property name="orientation">vertical</property>
- <property name="spacing">2</property>
+ <property name="spacing">4</property>
<child>
<object class="GtkLabel" id="label39">
<property name="visible">True</property>
@@ -1087,10 +1065,8 @@
<placeholder/>
</child>
<child>
- <object class="GtkNotebook" id="advanced">
+ <object class="GtkViewport" id="advanced">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="show_tabs">False</property>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
@@ -1292,9 +1268,6 @@
</child>
</object>
</child>
- <child type="tab">
- <placeholder/>
- </child>
</object>
<packing>
<property name="position">3</property>
Modified: xfce4-power-manager/trunk/libxfpm/xfpm-common.c
===================================================================
--- xfce4-power-manager/trunk/libxfpm/xfpm-common.c 2009-07-26 23:00:54 UTC (rev 7847)
+++ xfce4-power-manager/trunk/libxfpm/xfpm-common.c 2009-07-27 06:50:10 UTC (rev 7848)
@@ -42,8 +42,16 @@
static void
xfpm_link_browser (GtkAboutDialog *about, const gchar *link, gpointer data)
{
- gchar *cmd = g_strdup_printf ("%s %s","xfbrowser4", link);
- g_spawn_command_line_async (cmd, NULL);
+ gchar *cmd;
+
+ cmd = g_strdup_printf ("%s %s","xdg-open", link);
+
+ if ( !g_spawn_command_line_async (cmd, NULL) )
+ {
+ g_free (cmd);
+ cmd = g_strdup_printf ("%s %s","xfbrowser4", link);
+ g_spawn_command_line_async (cmd, NULL);
+ }
g_free (cmd);
}
Modified: xfce4-power-manager/trunk/po/xfce4-power-manager.pot
===================================================================
--- xfce4-power-manager/trunk/po/xfce4-power-manager.pot 2009-07-26 23:00:54 UTC (rev 7847)
+++ xfce4-power-manager/trunk/po/xfce4-power-manager.pot 2009-07-27 06:50:10 UTC (rev 7848)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-03 21:57+0200\n"
+"POT-Creation-Date: 2009-07-27 08:46+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -41,139 +41,117 @@
msgstr ""
#: ../data/interfaces/xfpm-settings.ui.h:7
-msgid "Advanced"
-msgstr ""
-
-#: ../data/interfaces/xfpm-settings.ui.h:8 ../settings/xfpm-settings.c:1055
-msgid "Always show icon"
-msgstr ""
-
-#: ../data/interfaces/xfpm-settings.ui.h:9
msgid "Consider the computer on low power at:"
msgstr ""
-#: ../data/interfaces/xfpm-settings.ui.h:10
+#: ../data/interfaces/xfpm-settings.ui.h:8
msgid "Enable CPU frequency control"
msgstr ""
-#: ../data/interfaces/xfpm-settings.ui.h:11
+#: ../data/interfaces/xfpm-settings.ui.h:9
msgid "Enable monitor power management control"
msgstr ""
-#: ../data/interfaces/xfpm-settings.ui.h:12
+#: ../data/interfaces/xfpm-settings.ui.h:10
msgid "Enable notification"
msgstr ""
-#: ../data/interfaces/xfpm-settings.ui.h:13 ../settings/xfpm-settings.c:1456
-#: ../settings/xfpm-settings.c:1461
-msgid "General"
-msgstr ""
-
#. Hibernate menu option
-#: ../data/interfaces/xfpm-settings.ui.h:14 ../settings/xfpm-settings.c:775
+#: ../data/interfaces/xfpm-settings.ui.h:11 ../settings/xfpm-settings.c:775
#: ../settings/xfpm-settings.c:846 ../settings/xfpm-settings.c:970
-#: ../settings/xfpm-settings.c:1122 ../settings/xfpm-settings.c:1180
-#: ../settings/xfpm-settings.c:1235 ../src/xfpm-tray-icon.c:174
+#: ../settings/xfpm-settings.c:1125 ../settings/xfpm-settings.c:1183
+#: ../settings/xfpm-settings.c:1238 ../src/xfpm-tray-icon.c:174
#: ../src/xfpm-tray-icon.c:266
msgid "Hibernate"
msgstr ""
-#: ../data/interfaces/xfpm-settings.ui.h:15
+#: ../data/interfaces/xfpm-settings.ui.h:12
msgid "Lock screen when going for suspend/hibernate"
msgstr ""
-#: ../data/interfaces/xfpm-settings.ui.h:16
+#: ../data/interfaces/xfpm-settings.ui.h:13
msgid "Monitor"
msgstr ""
-#: ../data/interfaces/xfpm-settings.ui.h:17 ../settings/xfpm-settings.c:764
+#: ../data/interfaces/xfpm-settings.ui.h:14 ../settings/xfpm-settings.c:764
#: ../settings/xfpm-settings.c:835 ../settings/xfpm-settings.c:959
-#: ../settings/xfpm-settings.c:1111 ../settings/xfpm-settings.c:1169
-#: ../settings/xfpm-settings.c:1224
+#: ../settings/xfpm-settings.c:1114 ../settings/xfpm-settings.c:1172
+#: ../settings/xfpm-settings.c:1227
msgid "Nothing"
msgstr ""
-#: ../data/interfaces/xfpm-settings.ui.h:18 ../settings/xfpm-settings.c:1470
-#: ../settings/xfpm-settings.c:1475
-msgid "On AC"
-msgstr ""
-
-#: ../data/interfaces/xfpm-settings.ui.h:19
-msgid "On battery"
-msgstr ""
-
-#: ../data/interfaces/xfpm-settings.ui.h:20
+#: ../data/interfaces/xfpm-settings.ui.h:15
msgid "Power manager settings"
msgstr ""
-#: ../data/interfaces/xfpm-settings.ui.h:21
+#: ../data/interfaces/xfpm-settings.ui.h:16
msgid "Prefer power savings over performance"
msgstr ""
-#: ../data/interfaces/xfpm-settings.ui.h:22
+#: ../data/interfaces/xfpm-settings.ui.h:17
msgid "Put display to sleep when computer is inactive for:"
msgstr ""
-#: ../data/interfaces/xfpm-settings.ui.h:23
+#: ../data/interfaces/xfpm-settings.ui.h:18
msgid "Put the computer to sleep when inactive for:"
msgstr ""
-#: ../data/interfaces/xfpm-settings.ui.h:24
+#: ../data/interfaces/xfpm-settings.ui.h:19
msgid "Reduce screen brightness when computer is inactive for:"
msgstr ""
-#: ../data/interfaces/xfpm-settings.ui.h:25
+#: ../data/interfaces/xfpm-settings.ui.h:20
msgid "Set computer inactivity sleep mode:"
msgstr ""
-#: ../data/interfaces/xfpm-settings.ui.h:26
+#: ../data/interfaces/xfpm-settings.ui.h:21
msgid "Set monitor sleep mode:"
msgstr ""
-#: ../data/interfaces/xfpm-settings.ui.h:27
+#: ../data/interfaces/xfpm-settings.ui.h:22
msgid "Standby"
msgstr ""
#. Suspend menu option
-#: ../data/interfaces/xfpm-settings.ui.h:28 ../settings/xfpm-settings.c:769
+#: ../data/interfaces/xfpm-settings.ui.h:23 ../settings/xfpm-settings.c:769
#: ../settings/xfpm-settings.c:840 ../settings/xfpm-settings.c:964
-#: ../settings/xfpm-settings.c:1116 ../settings/xfpm-settings.c:1174
-#: ../settings/xfpm-settings.c:1229 ../src/xfpm-tray-icon.c:205
+#: ../settings/xfpm-settings.c:1119 ../settings/xfpm-settings.c:1177
+#: ../settings/xfpm-settings.c:1232 ../src/xfpm-tray-icon.c:205
#: ../src/xfpm-tray-icon.c:281
msgid "Suspend"
msgstr ""
-#: ../data/interfaces/xfpm-settings.ui.h:29
+#: ../data/interfaces/xfpm-settings.ui.h:24
msgid "Switch off display when computer is inactive for:"
msgstr ""
-#: ../data/interfaces/xfpm-settings.ui.h:30
+#: ../data/interfaces/xfpm-settings.ui.h:25
msgid "System tray icon: "
msgstr ""
-#: ../data/interfaces/xfpm-settings.ui.h:31
+#: ../data/interfaces/xfpm-settings.ui.h:26
msgid "When battery power is critical:"
msgstr ""
-#: ../data/interfaces/xfpm-settings.ui.h:32
+#: ../data/interfaces/xfpm-settings.ui.h:27
msgid "When hibernate button is pressed:"
msgstr ""
-#: ../data/interfaces/xfpm-settings.ui.h:33
+#: ../data/interfaces/xfpm-settings.ui.h:28
msgid "When laptop lid is closed:"
msgstr ""
-#: ../data/interfaces/xfpm-settings.ui.h:34
+#: ../data/interfaces/xfpm-settings.ui.h:29
msgid "When power button is pressed:"
msgstr ""
-#: ../data/interfaces/xfpm-settings.ui.h:35
+#: ../data/interfaces/xfpm-settings.ui.h:30
msgid "When sleep button is pressed:"
msgstr ""
-#: ../data/interfaces/xfpm-settings.ui.h:36
-#: ../settings/xfpm-settings-main.c:118 ../src/xfpm-main.c:187
-#: ../src/xfpm-main.c:271 ../src/xfpm-tray-icon.c:346
+#: ../data/interfaces/xfpm-settings.ui.h:31
+#: ../settings/xfpm-settings-main.c:118 ../src/xfpm-main.c:190
+#: ../src/xfpm-main.c:274 ../src/xfpm-tray-icon.c:346
#: ../src/xfce4-power-manager.desktop.in.h:2
msgid "Xfce Power Manager"
msgstr ""
@@ -201,12 +179,12 @@
msgstr ""
#: ../settings/xfpm-settings.c:563 ../settings/xfpm-settings.c:567
-#: ../src/xfpm-battery.c:453
+#: ../src/xfpm-battery.c:469
msgid "minutes"
msgstr ""
#: ../settings/xfpm-settings.c:565 ../settings/xfpm-settings.c:566
-#: ../settings/xfpm-settings.c:567 ../src/xfpm-battery.c:452
+#: ../settings/xfpm-settings.c:567 ../src/xfpm-battery.c:468
msgid "hours"
msgstr ""
@@ -215,9 +193,9 @@
msgstr ""
#: ../settings/xfpm-settings.c:746 ../settings/xfpm-settings.c:922
-#: ../settings/xfpm-settings.c:953 ../settings/xfpm-settings.c:1105
-#: ../settings/xfpm-settings.c:1163 ../settings/xfpm-settings.c:1218
-#: ../settings/xfpm-settings.c:1370
+#: ../settings/xfpm-settings.c:953 ../settings/xfpm-settings.c:1108
+#: ../settings/xfpm-settings.c:1166 ../settings/xfpm-settings.c:1221
+#: ../settings/xfpm-settings.c:1374
msgid "Hibernate and suspend operations not permitted"
msgstr ""
@@ -225,12 +203,12 @@
msgid "Shutdown and hibernate operations not permitted"
msgstr ""
-#: ../settings/xfpm-settings.c:779 ../settings/xfpm-settings.c:1126
+#: ../settings/xfpm-settings.c:779 ../settings/xfpm-settings.c:1129
msgid "Shutdown"
msgstr ""
-#: ../settings/xfpm-settings.c:782 ../settings/xfpm-settings.c:1129
-#: ../settings/xfpm-settings.c:1184 ../settings/xfpm-settings.c:1239
+#: ../settings/xfpm-settings.c:782 ../settings/xfpm-settings.c:1132
+#: ../settings/xfpm-settings.c:1187 ../settings/xfpm-settings.c:1242
msgid "Ask"
msgstr ""
@@ -238,6 +216,10 @@
msgid "Lock screen"
msgstr ""
+#: ../settings/xfpm-settings.c:1055
+msgid "Always show icon"
+msgstr ""
+
#: ../settings/xfpm-settings.c:1058
msgid "When battery is present"
msgstr ""
@@ -246,33 +228,45 @@
msgid "When battery is charging or discharging"
msgstr ""
-#: ../settings/xfpm-settings.c:1087
+#: ../settings/xfpm-settings.c:1064
+msgid "Never show icon"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:1090
msgid ""
"Disable Display Power Management Signaling (DPMS), e.g don't attempt to "
"switch off the display or put it in sleep mode."
msgstr ""
-#: ../settings/xfpm-settings.c:1290
+#: ../settings/xfpm-settings.c:1294
msgid "Suspend operation not permitted"
msgstr ""
-#: ../settings/xfpm-settings.c:1296
+#: ../settings/xfpm-settings.c:1300
msgid "Hibernate operation not permitted"
msgstr ""
-#: ../settings/xfpm-settings.c:1343
+#: ../settings/xfpm-settings.c:1347
msgid "When all the power sources of the computer reach this charge level"
msgstr ""
-#: ../settings/xfpm-settings.c:1485 ../settings/xfpm-settings.c:1490
+#: ../settings/xfpm-settings.c:1460 ../settings/xfpm-settings.c:1465
+msgid "General"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:1474 ../settings/xfpm-settings.c:1479
+msgid "On AC"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:1489 ../settings/xfpm-settings.c:1494
msgid "On Battery"
msgstr ""
-#: ../settings/xfpm-settings.c:1499 ../settings/xfpm-settings.c:1504
+#: ../settings/xfpm-settings.c:1503 ../settings/xfpm-settings.c:1508
msgid "Extended"
msgstr ""
-#: ../settings/xfpm-settings.c:1569
+#: ../settings/xfpm-settings.c:1573
msgid "Check your power manager installation"
msgstr ""
@@ -284,8 +278,8 @@
msgid "SOCKET ID"
msgstr ""
-#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:149
-#: ../src/xfpm-main.c:170
+#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:152
+#: ../src/xfpm-main.c:173
#, c-format
msgid "Type '%s --help' for usage."
msgstr ""
@@ -302,7 +296,7 @@
msgid "Unable to connect to Xfce Power Manager"
msgstr ""
-#: ../settings/xfpm-settings-main.c:173 ../src/xfpm-main.c:198
+#: ../settings/xfpm-settings-main.c:173 ../src/xfpm-main.c:201
#, c-format
msgid "Xfce power manager is not running"
msgstr ""
@@ -343,8 +337,8 @@
msgid "Your battery is discharging"
msgstr ""
-#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:438
-#: ../src/xfpm-battery.c:470
+#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:454
+#: ../src/xfpm-battery.c:486
msgid "System is running on battery power"
msgstr ""
@@ -356,93 +350,93 @@
msgid "System is running on low power"
msgstr ""
-#: ../src/xfpm-battery.c:238 ../src/xfpm-supply.c:340 ../src/xfpm-supply.c:363
+#: ../src/xfpm-battery.c:240 ../src/xfpm-supply.c:340 ../src/xfpm-supply.c:363
#: ../src/xfpm-tray-icon.c:119 ../src/xfpm-tray-icon.c:142
-#: ../src/xfpm-manager.c:221
+#: ../src/xfpm-manager.c:228
msgid "Xfce power manager"
msgstr ""
-#: ../src/xfpm-battery.c:268
+#: ../src/xfpm-battery.c:277
msgid "Your UPS"
msgstr ""
-#: ../src/xfpm-battery.c:270
+#: ../src/xfpm-battery.c:279
msgid "Your Mouse battery"
msgstr ""
-#: ../src/xfpm-battery.c:272
+#: ../src/xfpm-battery.c:281
msgid "Your Keyboard battery"
msgstr ""
-#: ../src/xfpm-battery.c:274
+#: ../src/xfpm-battery.c:283
msgid "Your Camera battery"
msgstr ""
-#: ../src/xfpm-battery.c:276
+#: ../src/xfpm-battery.c:285
msgid "Your PDA battery"
msgstr ""
-#: ../src/xfpm-battery.c:278
+#: ../src/xfpm-battery.c:287
msgid "Your Battery"
msgstr ""
-#: ../src/xfpm-battery.c:293
+#: ../src/xfpm-battery.c:302
msgid "is empty"
msgstr ""
-#: ../src/xfpm-battery.c:299
+#: ../src/xfpm-battery.c:308
msgid "is fully charged"
msgstr ""
-#: ../src/xfpm-battery.c:304
+#: ../src/xfpm-battery.c:313
msgid "charge level"
msgstr ""
-#: ../src/xfpm-battery.c:309
+#: ../src/xfpm-battery.c:318
msgid "is charging"
msgstr ""
-#: ../src/xfpm-battery.c:316
+#: ../src/xfpm-battery.c:325
msgid "is discharging"
msgstr ""
-#: ../src/xfpm-battery.c:321
+#: ../src/xfpm-battery.c:330
msgid "charge is low"
msgstr ""
-#: ../src/xfpm-battery.c:326
+#: ../src/xfpm-battery.c:335
msgid "is almost empty"
msgstr ""
-#: ../src/xfpm-battery.c:371
+#: ../src/xfpm-battery.c:387
msgid "is not present"
msgstr ""
-#: ../src/xfpm-battery.c:410
+#: ../src/xfpm-battery.c:426
msgid "Battery not present"
msgstr ""
-#: ../src/xfpm-battery.c:434 ../src/xfpm-battery.c:466
+#: ../src/xfpm-battery.c:450 ../src/xfpm-battery.c:482
msgid "Battery"
msgstr ""
-#: ../src/xfpm-battery.c:437 ../src/xfpm-battery.c:469
+#: ../src/xfpm-battery.c:453 ../src/xfpm-battery.c:485
msgid "System is running on AC power"
msgstr ""
-#: ../src/xfpm-battery.c:444
+#: ../src/xfpm-battery.c:460
msgid "Estimated time left"
msgstr ""
-#: ../src/xfpm-battery.c:448
+#: ../src/xfpm-battery.c:464
msgid "Estimated time to be fully charged"
msgstr ""
-#: ../src/xfpm-battery.c:452
+#: ../src/xfpm-battery.c:468
msgid "hour"
msgstr ""
-#: ../src/xfpm-battery.c:453
+#: ../src/xfpm-battery.c:469
msgid "minute"
msgstr ""
@@ -487,40 +481,40 @@
"\n"
msgstr ""
-#: ../src/xfpm-main.c:128
+#: ../src/xfpm-main.c:131
msgid "Do not daemonize"
msgstr ""
-#: ../src/xfpm-main.c:129
+#: ../src/xfpm-main.c:132
msgid "Restart the running instance of Xfce power manager"
msgstr ""
-#: ../src/xfpm-main.c:130
+#: ../src/xfpm-main.c:133
msgid "Show the configuration dialog"
msgstr ""
-#: ../src/xfpm-main.c:131
+#: ../src/xfpm-main.c:134
msgid "Quit any running xfce power manager"
msgstr ""
-#: ../src/xfpm-main.c:132
+#: ../src/xfpm-main.c:135
msgid "Version information"
msgstr ""
-#: ../src/xfpm-main.c:168
+#: ../src/xfpm-main.c:171
#, c-format
msgid "Too many arguments"
msgstr ""
-#: ../src/xfpm-main.c:184
+#: ../src/xfpm-main.c:187
msgid "Unable to get connection to the message bus session"
msgstr ""
-#: ../src/xfpm-main.c:272
+#: ../src/xfpm-main.c:275
msgid "Another power manager is already running"
msgstr ""
-#: ../src/xfpm-main.c:278
+#: ../src/xfpm-main.c:281
#, c-format
msgid "Xfce power manager is already running"
msgstr ""
@@ -598,31 +592,32 @@
msgid "No data available"
msgstr ""
-#: ../src/xfpm-engine.c:753 ../src/xfpm-engine.c:779 ../src/xfpm-engine.c:808
+#: ../src/xfpm-engine.c:763 ../src/xfpm-engine.c:789 ../src/xfpm-engine.c:815
+#: ../src/xfpm-engine.c:844
#, c-format
msgid "Permission denied"
msgstr ""
-#: ../src/xfpm-engine.c:786
+#: ../src/xfpm-engine.c:822
#, c-format
msgid "Hibernate not supported"
msgstr ""
-#: ../src/xfpm-engine.c:815
+#: ../src/xfpm-engine.c:851
#, c-format
msgid "Suspend not supported"
msgstr ""
-#: ../src/xfpm-manager.c:221
+#: ../src/xfpm-manager.c:228
msgid "HAL daemon is not running"
msgstr ""
-#: ../src/xfpm-inhibit.c:333
+#: ../src/xfpm-inhibit.c:330
#, c-format
msgid "Invalid arguments"
msgstr ""
-#: ../src/xfpm-inhibit.c:359
+#: ../src/xfpm-inhibit.c:356
#, c-format
msgid "Invalid cookie"
msgstr ""
@@ -655,8 +650,8 @@
msgid "System failed to sleep"
msgstr ""
-#: ../src/xfpm-shutdown.c:409 ../src/xfpm-shutdown.c:432
-#: ../src/xfpm-shutdown.c:466
+#: ../src/xfpm-shutdown.c:411 ../src/xfpm-shutdown.c:435
+#: ../src/xfpm-shutdown.c:461 ../src/xfpm-shutdown.c:497
#, c-format
msgid "HAL daemon is currently not connected"
msgstr ""
@@ -693,7 +688,7 @@
msgid "mAh"
msgstr ""
-#: ../libxfpm/xfpm-common.c:154
+#: ../libxfpm/xfpm-common.c:162
msgid "translator-credits"
msgstr ""
Modified: xfce4-power-manager/trunk/settings/xfpm-settings.c
===================================================================
--- xfce4-power-manager/trunk/settings/xfpm-settings.c 2009-07-26 23:00:54 UTC (rev 7847)
+++ xfce4-power-manager/trunk/settings/xfpm-settings.c 2009-07-27 06:50:10 UTC (rev 7848)
@@ -1046,7 +1046,7 @@
GtkListStore *list_store;
GtkTreeIter iter;
- list_store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_INT);
+ list_store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
tray = GTK_WIDGET (gtk_builder_get_object (xml, "tray-combox"));
gtk_combo_box_set_model (GTK_COMBO_BOX(tray), GTK_TREE_MODEL(list_store));
@@ -1060,6 +1060,9 @@
gtk_list_store_append(list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("When battery is charging or discharging"), 1, SHOW_ICON_WHEN_BATTERY_CHARGING_DISCHARGING, -1);
+ gtk_list_store_append(list_store, &iter);
+ gtk_list_store_set (list_store, &iter, 0, _("Never show icon"), 1, NEVER_SHOW_ICON, -1);
+
value = xfconf_channel_get_uint (channel, PROPERTIES_PREFIX SHOW_TRAY_ICON_CFG, SHOW_ICON_WHEN_BATTERY_PRESENT);
for ( valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list_store), &iter);
Modified: xfce4-power-manager/trunk/src/xfpm-battery.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-battery.c 2009-07-26 23:00:54 UTC (rev 7847)
+++ xfce4-power-manager/trunk/src/xfpm-battery.c 2009-07-27 06:50:10 UTC (rev 7848)
@@ -136,6 +136,8 @@
if ( show_icon == SHOW_ICON_ALWAYS )
visible = TRUE;
+ else if ( show_icon == NEVER_SHOW_ICON )
+ visible = FALSE;
else if ( show_icon == SHOW_ICON_WHEN_BATTERY_PRESENT )
{
if ( battery->priv->state == BATTERY_NOT_PRESENT )
@@ -250,7 +252,14 @@
xfpm_battery_notify (XfpmBattery *battery)
{
gboolean notify;
+ static gboolean starting_up = TRUE;
+ if ( starting_up )
+ {
+ starting_up = FALSE;
+ return;
+ }
+
g_object_get (G_OBJECT (battery->priv->conf),
GENERAL_NOTIFICATION_CFG, ¬ify,
NULL);
@@ -335,8 +344,15 @@
static void
xfpm_battery_refresh_common (XfpmBattery *battery, guint percentage, XfpmBatteryState state)
{
- xfpm_battery_refresh_icon (battery, state, percentage);
+ XfpmShowIcon show_icon;
+ g_object_get (G_OBJECT (battery->priv->conf),
+ SHOW_TRAY_ICON_CFG, &show_icon,
+ NULL);
+
+ if ( show_icon != NEVER_SHOW_ICON )
+ xfpm_battery_refresh_icon (battery, state, percentage);
+
if ( battery->priv->state != state)
{
battery->priv->state = state;
@@ -344,7 +360,7 @@
TRACE("Emitting signal battery state changed");
g_signal_emit (G_OBJECT(battery), signals[BATTERY_STATE_CHANGED], 0, state);
- if ( battery->priv->state != BATTERY_NOT_FULLY_CHARGED )
+ if ( battery->priv->state != BATTERY_NOT_FULLY_CHARGED && show_icon != NEVER_SHOW_ICON)
xfpm_battery_notify (battery);
else
xfpm_notify_close_normal (battery->priv->notify);
Modified: xfce4-power-manager/trunk/src/xfpm-engine.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-engine.c 2009-07-26 23:00:54 UTC (rev 7847)
+++ xfce4-power-manager/trunk/src/xfpm-engine.c 2009-07-27 06:50:10 UTC (rev 7848)
@@ -777,7 +777,7 @@
{
gboolean caller_privilege;
- TRACE ("Hibernate message received");
+ TRACE ("Reboot message received");
g_object_get (G_OBJECT (engine->priv->shutdown),
"caller-privilege", &caller_privilege,
Modified: xfce4-power-manager/trunk/src/xfpm-enum-glib.h
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-enum-glib.h 2009-07-26 23:00:54 UTC (rev 7847)
+++ xfce4-power-manager/trunk/src/xfpm-enum-glib.h 2009-07-27 06:50:10 UTC (rev 7848)
@@ -74,7 +74,8 @@
{
SHOW_ICON_ALWAYS,
SHOW_ICON_WHEN_BATTERY_PRESENT,
- SHOW_ICON_WHEN_BATTERY_CHARGING_DISCHARGING
+ SHOW_ICON_WHEN_BATTERY_CHARGING_DISCHARGING,
+ NEVER_SHOW_ICON
} XfpmShowIcon;
Modified: xfce4-power-manager/trunk/src/xfpm-main.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-main.c 2009-07-26 23:00:54 UTC (rev 7847)
+++ xfce4-power-manager/trunk/src/xfpm-main.c 2009-07-27 06:50:10 UTC (rev 7848)
@@ -64,7 +64,10 @@
{
XfpmManager *manager = (XfpmManager *) data;
- xfpm_manager_stop (manager);
+ TRACE ("sig %d", sig);
+
+ if ( sig != SIGHUP )
+ xfpm_manager_stop (manager);
}
static void G_GNUC_NORETURN
Modified: xfce4-power-manager/trunk/src/xfpm-manager.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-manager.c 2009-07-26 23:00:54 UTC (rev 7847)
+++ xfce4-power-manager/trunk/src/xfpm-manager.c 2009-07-27 06:50:10 UTC (rev 7848)
@@ -101,6 +101,7 @@
static void
xfpm_manager_session_die_cb (XfpmSession *session, XfpmManager *manager)
{
+ TRACE ("Session die signal, exiting");
xfpm_manager_quit (manager);
}
@@ -169,8 +170,10 @@
static gboolean
xfpm_manager_quit (XfpmManager *manager)
{
+ TRACE ("Exiting");
+
xfpm_manager_release_names (manager);
- //xfpm_session_quit (manager->priv->session);
+ xfpm_session_quit (manager->priv->session);
g_object_unref (G_OBJECT (manager));
@@ -184,14 +187,13 @@
if ( !xfpm_dbus_register_name (dbus_g_connection_get_connection(manager->priv->session_bus),
"org.xfce.PowerManager") )
{
- g_critical("Unable to reserve bus name: Xfce Power Manager\n");
+ g_error ("Unable to reserve bus name: Xfce Power Manager\n");
}
if (!xfpm_dbus_register_name (dbus_g_connection_get_connection(manager->priv->session_bus),
"org.freedesktop.PowerManagement") )
{
-
- g_critical ("Unable to reserve bus name: PowerManagement\n");
+ g_error ("Unable to reserve bus name: PowerManagement\n");
}
}
@@ -234,7 +236,7 @@
void xfpm_manager_stop (XfpmManager *manager)
{
-
+ TRACE ("Stopping");
g_return_if_fail (XFPM_IS_MANAGER (manager));
xfpm_manager_quit (manager);
}
Modified: xfce4-power-manager/trunk/src/xfpm-session.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-session.c 2009-07-26 23:00:54 UTC (rev 7847)
+++ xfce4-power-manager/trunk/src/xfpm-session.c 2009-07-27 06:50:10 UTC (rev 7848)
@@ -165,8 +165,15 @@
DBusGProxy *proxy;
GError *error = NULL;
- bus = dbus_g_bus_get (DBUS_BUS_SESSION, NULL);
+ bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
+ if ( error )
+ {
+ g_print ("Unable to get DBUS session connection, %s", error->message);
+ g_error_free (error);
+ return FALSE;
+ }
+
proxy = dbus_g_proxy_new_for_name (bus,
"org.xfce.SessionManager",
"/org/xfce/SessionManager",
Modified: xfce4-power-manager/trunk/src/xfpm-shutdown.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-shutdown.c 2009-07-26 23:00:54 UTC (rev 7847)
+++ xfce4-power-manager/trunk/src/xfpm-shutdown.c 2009-07-27 06:50:10 UTC (rev 7848)
@@ -404,6 +404,8 @@
{
g_return_if_fail (XFPM_IS_SHUTDOWN(shutdown));
+ TRACE ("Start");
+
if ( G_UNLIKELY (shutdown->priv->connected == FALSE) )
{
g_set_error (error, XFPM_ERROR, XFPM_ERROR_HAL_DISCONNECTED, _("HAL daemon is currently not connected"));
@@ -426,6 +428,8 @@
{
g_return_if_fail (XFPM_IS_SHUTDOWN(shutdown));
+ TRACE ("Start");
+
if ( G_UNLIKELY (shutdown->priv->connected == FALSE) )
{
g_set_error (error, XFPM_ERROR, XFPM_ERROR_HAL_DISCONNECTED, _("HAL daemon is currently not connected"));
@@ -434,7 +438,7 @@
}
xfpm_send_message_to_network_manager ("sleep");
- if ( !xfpm_session_reboot (shutdown->priv->session) )
+// if ( !xfpm_session_reboot (shutdown->priv->session) )
{
if ( !xfpm_shutdown_internal (dbus_g_connection_get_connection(shutdown->priv->bus), "Reboot", NULL))
xfpm_send_message_to_network_manager ("wake");
@@ -450,6 +454,8 @@
g_return_if_fail (XFPM_IS_SHUTDOWN(shutdown));
+ TRACE ("Start");
+
if ( G_UNLIKELY (shutdown->priv->connected == FALSE) )
{
g_set_error (error, XFPM_ERROR, XFPM_ERROR_HAL_DISCONNECTED, _("HAL daemon is currently not connected"));
@@ -484,6 +490,8 @@
g_return_if_fail (XFPM_IS_SHUTDOWN(shutdown));
+ TRACE ("Start");
+
if ( G_UNLIKELY (shutdown->priv->connected == FALSE) )
{
g_set_error (error, XFPM_ERROR, XFPM_ERROR_HAL_DISCONNECTED, _("HAL daemon is currently not connected"));
@@ -513,6 +521,8 @@
{
g_return_if_fail (XFPM_IS_SHUTDOWN (shutdown));
+ TRACE ("Start");
+
xfpm_session_ask_shutdown (shutdown->priv->session);
}
@@ -520,5 +530,7 @@
{
g_return_if_fail (XFPM_IS_SHUTDOWN (shutdown));
+ TRACE ("Start");
+
xfpm_shutdown_power_management_check (shutdown);
}
Modified: xfce4-power-manager/trunk/src/xfpm-xfconf.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-xfconf.c 2009-07-26 23:00:54 UTC (rev 7847)
+++ xfce4-power-manager/trunk/src/xfpm-xfconf.c 2009-07-27 06:50:10 UTC (rev 7848)
@@ -269,7 +269,7 @@
g_param_spec_uint (SHOW_TRAY_ICON_CFG,
NULL, NULL,
SHOW_ICON_ALWAYS,
- SHOW_ICON_WHEN_BATTERY_CHARGING_DISCHARGING,
+ NEVER_SHOW_ICON,
SHOW_ICON_WHEN_BATTERY_PRESENT,
G_PARAM_READWRITE));
More information about the Goodies-commits
mailing list