[Goodies-commits] r7349 - in xfce4-power-manager/trunk: . settings src

[Ali Abdallah]

Author: aliov
Date: 2009-05-16 17:06:56 +0000 (Sat, 16 May 2009)
New Revision: 7349

Modified:
   xfce4-power-manager/trunk/ChangeLog
   xfce4-power-manager/trunk/settings/xfpm-settings.glade
   xfce4-power-manager/trunk/src/xfpm-tray-icon.c
Log:
Open settings dialog when tray icon is clicked

Modified: xfce4-power-manager/trunk/ChangeLog
===================================================================
--- xfce4-power-manager/trunk/ChangeLog	2009-05-16 16:55:59 UTC (rev 7348)
+++ xfce4-power-manager/trunk/ChangeLog	2009-05-16 17:06:56 UTC (rev 7349)
@@ -1,4 +1,7 @@
 
+2009-05-16 19:06 Ali aliov at xfce.org 
+	 * : Open settings dialog when tray icon is clicked
+
 2009-05-16 18:55 Ali aliov at xfce.org 
 	 * : Reduce the settings dialog size
 

Modified: xfce4-power-manager/trunk/settings/xfpm-settings.glade
===================================================================
--- xfce4-power-manager/trunk/settings/xfpm-settings.glade	2009-05-16 16:55:59 UTC (rev 7348)
+++ xfce4-power-manager/trunk/settings/xfpm-settings.glade	2009-05-16 17:06:56 UTC (rev 7349)
@@ -8,7 +8,7 @@
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Xfce Power Manager</property>
     <property name="window_position">center-on-parent</property>
-    <property name="icon_name">gpm-ac-adapter</property>
+    <property name="icon_name">xfpm-ac-adapter</property>
     <property name="type_hint">dialog</property>
     <property name="has_separator">False</property>
     <property name="subtitle" translatable="yes">Power manager settings</property>
@@ -29,6 +29,7 @@
                     <property name="headers_visible">False</property>
                   </widget>
                   <packing>
+                    <property name="expand">False</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
@@ -1229,7 +1230,6 @@
                     </child>
                   </widget>
                   <packing>
-                    <property name="expand">False</property>
                     <property name="position">1</property>
                   </packing>
                 </child>

Modified: xfce4-power-manager/trunk/src/xfpm-tray-icon.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-tray-icon.c	2009-05-16 16:55:59 UTC (rev 7348)
+++ xfce4-power-manager/trunk/src/xfpm-tray-icon.c	2009-05-16 17:06:56 UTC (rev 7349)
@@ -395,6 +395,12 @@
 }
 
 static void
+xfpm_tray_icon_activated_cb (XfpmTrayIcon *tray)
+{
+    xfpm_preferences ();
+}
+
+static void
 xfpm_tray_icon_class_init(XfpmTrayIconClass *klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS(klass);
@@ -436,6 +442,8 @@
     g_signal_connect (tray->priv->icon, "popup-menu",
 		      G_CALLBACK (xfpm_tray_icon_popup_menu_cb), tray);
 		      
+    g_signal_connect_swapped (tray->priv->icon, "activate",
+			      G_CALLBACK (xfpm_tray_icon_activated_cb), tray);
     tray->priv->sig = g_signal_connect (tray->priv->inhibit, "has-inhibit-changed",
 					G_CALLBACK (xfpm_tray_icon_inhibit_changed_cb), tray);