Skip to content
Snippets Groups Projects
Commit 72a65bbd authored by Ali Abdallah's avatar Ali Abdallah
Browse files

*: Fix minor issue of displaying adapter icon on desktop computers 

	*: Minor changes in the glade file.

(Old svn revision: 7415)
parent 5ccde9b8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
ChangeLog
+ 4
− 0
View file @ 72a65bbd
2009-05-24 15:30 Ali aliov@xfce.org
*: Fix minor issue of displaying adapter icon on desktop computers
*: Minor changes in the glade file.
2009-05-21 15:00 Ali aliov@xfce.org 2009-05-21 15:00 Ali aliov@xfce.org
*: Properly free the inhibitor data when the inhibitor *: Properly free the inhibitor data when the inhibitor
*: Don't accept events at all if they were not mapped. *: Don't accept events at all if they were not mapped.
......
settings/xfpm-settings.glade
+ 31
− 31
View file @ 72a65bbd
...@@ -334,37 +334,6 @@ ...@@ -334,37 +334,6 @@
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
<child>
<widget class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<widget class="GtkLabel" id="label9">
<property name="visible">True</property>
<property name="label" translatable="yes">Put the computer to sleep when inactive for:</property>
</widget>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkHScale" id="inactivity-on-ac">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="adjustment">30 30 360 1 10 10</property>
<property name="digits">0</property>
<property name="value_pos">bottom</property>
</widget>
<packing>
<property name="position">1</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
</widget> </widget>
</child> </child>
</widget> </widget>
...@@ -386,6 +355,37 @@ ...@@ -386,6 +355,37 @@
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
<child>
<widget class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<widget class="GtkLabel" id="label9">
<property name="visible">True</property>
<property name="label" translatable="yes">Put the computer to sleep when inactive for:</property>
</widget>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkHScale" id="inactivity-on-ac">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="adjustment">30 30 360 1 10 10</property>
<property name="digits">0</property>
<property name="value_pos">bottom</property>
</widget>
<packing>
<property name="position">1</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
</widget> </widget>
</child> </child>
<child> <child>
......
src/xfpm-supply.c
+ 16
− 0
View file @ 72a65bbd
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
#include "xfpm-marshal.h" #include "xfpm-marshal.h"
static void xfpm_supply_finalize (GObject *object); static void xfpm_supply_finalize (GObject *object);
static void xfpm_supply_refresh_tray_icon (XfpmSupply *supply);
#define XFPM_SUPPLY_GET_PRIVATE(o) \ #define XFPM_SUPPLY_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE((o), XFPM_TYPE_SUPPLY, XfpmSupplyPrivate)) (G_TYPE_INSTANCE_GET_PRIVATE((o), XFPM_TYPE_SUPPLY, XfpmSupplyPrivate))
...@@ -117,6 +118,12 @@ xfpm_supply_has_inhibit_changed_cb (XfpmInhibit *inhibit, gboolean inhibited, Xf ...@@ -117,6 +118,12 @@ xfpm_supply_has_inhibit_changed_cb (XfpmInhibit *inhibit, gboolean inhibited, Xf
supply->priv->inhibited = inhibited; supply->priv->inhibited = inhibited;
} }
static void
xfpm_supply_tray_settings_changed (XfpmSupply *supply)
{
xfpm_supply_refresh_tray_icon (supply);
}
static void static void
xfpm_supply_class_init(XfpmSupplyClass *klass) xfpm_supply_class_init(XfpmSupplyClass *klass)
{ {
...@@ -175,6 +182,9 @@ xfpm_supply_init (XfpmSupply *supply) ...@@ -175,6 +182,9 @@ xfpm_supply_init (XfpmSupply *supply)
g_signal_connect (supply->priv->inhibit, "has-inhibit-changed", g_signal_connect (supply->priv->inhibit, "has-inhibit-changed",
G_CALLBACK (xfpm_supply_has_inhibit_changed_cb), supply); G_CALLBACK (xfpm_supply_has_inhibit_changed_cb), supply);
g_signal_connect_swapped (supply->priv->conf, "tray_icon_settings_changed",
G_CALLBACK (xfpm_supply_tray_settings_changed), supply);
} }
static void static void
...@@ -218,7 +228,13 @@ xfpm_supply_refresh_tray_icon (XfpmSupply *supply) ...@@ -218,7 +228,13 @@ xfpm_supply_refresh_tray_icon (XfpmSupply *supply)
xfpm_tray_icon_set_visible (supply->priv->tray, TRUE); xfpm_tray_icon_set_visible (supply->priv->tray, TRUE);
} }
else else
{
xfpm_tray_icon_set_visible (supply->priv->tray, FALSE); xfpm_tray_icon_set_visible (supply->priv->tray, FALSE);
}
}
else
{
xfpm_tray_icon_set_visible (supply->priv->tray, FALSE);
} }
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment