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

[Ali Abdallah]

Author: aliov
Date: 2009-04-05 17:40:25 +0000 (Sun, 05 Apr 2009)
New Revision: 7115

Modified:
   xfce4-power-manager/trunk/ChangeLog
   xfce4-power-manager/trunk/libxfpm/xfpm-common.c
   xfce4-power-manager/trunk/settings/xfpm-settings-main.c
   xfce4-power-manager/trunk/settings/xfpm-settings.c
   xfce4-power-manager/trunk/settings/xfpm-settings.glade
   xfce4-power-manager/trunk/src/xfpm-supply.c
Log:
Fix bug: 5193, the help document in the settings dialog

Modified: xfce4-power-manager/trunk/ChangeLog
===================================================================
--- xfce4-power-manager/trunk/ChangeLog	2009-04-05 14:54:57 UTC (rev 7114)
+++ xfce4-power-manager/trunk/ChangeLog	2009-04-05 17:40:25 UTC (rev 7115)
@@ -1,4 +1,7 @@
 
+2009-04-05 19:40 Ali aliov at xfce.org 
+	 * : Fix bug: 5193, the help document in the settings dialog
+
 2009-04-04 13:58 Ali aliov at xfce.org 
 	 * : Alpha2 release
 

Modified: xfce4-power-manager/trunk/libxfpm/xfpm-common.c
===================================================================
--- xfce4-power-manager/trunk/libxfpm/xfpm-common.c	2009-04-05 14:54:57 UTC (rev 7114)
+++ xfce4-power-manager/trunk/libxfpm/xfpm-common.c	2009-04-05 17:40:25 UTC (rev 7115)
@@ -163,7 +163,7 @@
     
     gtk_show_about_dialog (NULL,
 		     "authors", authors,
-		     "copyright", "Copyright \302\251 2008 Ali Abdallah",
+		     "copyright", "Copyright \302\251 2008-2009 Ali Abdallah",
 		     "destroy-with-parent", TRUE,
 		     "documenters", documenters,
 		     "license", XFCE_LICENSE_GPL,

Modified: xfce4-power-manager/trunk/settings/xfpm-settings-main.c
===================================================================
--- xfce4-power-manager/trunk/settings/xfpm-settings-main.c	2009-04-05 14:54:57 UTC (rev 7114)
+++ xfce4-power-manager/trunk/settings/xfpm-settings-main.c	2009-04-05 17:40:25 UTC (rev 7115)
@@ -46,10 +46,10 @@
 #include "xfpm-settings.h"
 #include "xfpm-config.h"
 
+//FIXME: Unref XfconfChannel
 static void dialog_response_cb (GtkDialog *dialog, gint response, gpointer data)
 {
     DBusGConnection *bus     = (DBusGConnection *) data;    
-    
     switch(response)
     {
 	case GTK_RESPONSE_HELP:
@@ -58,7 +58,6 @@
 	default:
 	    xfpm_dbus_release_name(dbus_g_connection_get_connection(bus), "org.xfce.PowerManager.Config");
 	    dbus_g_connection_unref(bus);
-	    
 	    xfconf_shutdown();
 	    gtk_widget_destroy(GTK_WIDGET(dialog));
 	    gtk_main_quit();

Modified: xfce4-power-manager/trunk/settings/xfpm-settings.c
===================================================================
--- xfce4-power-manager/trunk/settings/xfpm-settings.c	2009-04-05 14:54:57 UTC (rev 7114)
+++ xfce4-power-manager/trunk/settings/xfpm-settings.c	2009-04-05 17:40:25 UTC (rev 7115)
@@ -58,7 +58,6 @@
 static void
 battery_critical_changed_cb (GtkWidget *w, XfconfChannel *channel)
 {
-    
     GtkTreeModel     *model;
     GtkTreeIter       selected_row;
     gint value = 0;
@@ -1107,21 +1106,6 @@
     g_signal_connect(view,"cursor-changed",G_CALLBACK(_cursor_changed_cb),NULL);
 }
 
-static void dialog_response_cb (GtkDialog *dialog, gint response, gpointer data)
-{
-    XfconfChannel *channel = (XfconfChannel *)data;
-    
-    switch(response)
-    {
-	case GTK_RESPONSE_HELP:
-	    xfpm_help();
-	    break;
-	default:
-	    g_object_unref(G_OBJECT(channel));
-	    break;
-    }
-}
-
 GtkWidget *
 xfpm_settings_dialog_new (XfconfChannel *channel, 
 			  gboolean system_laptop, gboolean user_privilege,
@@ -1150,8 +1134,6 @@
     
     xfpm_settings_general   (channel, user_privilege, can_suspend, can_hibernate);
     xfpm_settings_advanced  (channel, system_laptop, user_privilege);
-
-    g_signal_connect (dialog, "response", G_CALLBACK(dialog_response_cb), channel);
     
     return dialog;
 }

Modified: xfce4-power-manager/trunk/settings/xfpm-settings.glade
===================================================================
--- xfce4-power-manager/trunk/settings/xfpm-settings.glade	2009-04-05 14:54:57 UTC (rev 7114)
+++ xfce4-power-manager/trunk/settings/xfpm-settings.glade	2009-04-05 17:40:25 UTC (rev 7115)
@@ -981,10 +981,10 @@
         <child internal-child="action_area">
           <widget class="GtkHButtonBox" id="dialog-action_area">
             <property name="visible">True</property>
-            <property name="layout_style">edge</property>
             <child>
-              <widget class="GtkButton" id="button2">
+              <widget class="GtkButton" id="help-button">
                 <property name="label" translatable="yes">gtk-help</property>
+                <property name="response_id">-11</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -997,8 +997,9 @@
               </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="button1">
+              <widget class="GtkButton" id="close-button">
                 <property name="label" translatable="yes">gtk-close</property>
+                <property name="response_id">-7</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>

Modified: xfce4-power-manager/trunk/src/xfpm-supply.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-supply.c	2009-04-05 14:54:57 UTC (rev 7114)
+++ xfce4-power-manager/trunk/src/xfpm-supply.c	2009-04-05 17:40:25 UTC (rev 7115)
@@ -185,6 +185,9 @@
     int i;
     gboolean low_power = FALSE;
     
+    if (supply->priv->adapter_present )
+	return FALSE;
+    
     list = g_hash_table_get_values (supply->priv->hash);
     
     if ( !list)