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

Ali Abdallah aliov at xfce.org
Sat Mar 14 17:23:44 CET 2009


Author: aliov
Date: 2009-03-14 16:23:43 +0000 (Sat, 14 Mar 2009)
New Revision: 6904

Modified:
   xfce4-power-manager/trunk/ChangeLog
   xfce4-power-manager/trunk/configure.ac.in
   xfce4-power-manager/trunk/src/Makefile.am
   xfce4-power-manager/trunk/src/xfpm-adapter.c
   xfce4-power-manager/trunk/src/xfpm-main.c
   xfce4-power-manager/trunk/src/xfpm-supply.c
Log:
Added desktop file to be installed in xdt/autostart

Modified: xfce4-power-manager/trunk/ChangeLog
===================================================================
--- xfce4-power-manager/trunk/ChangeLog	2009-03-14 15:40:09 UTC (rev 6903)
+++ xfce4-power-manager/trunk/ChangeLog	2009-03-14 16:23:43 UTC (rev 6904)
@@ -1,4 +1,7 @@
 
+2009-03-14 17:23 Ali aliov at xfce.org 
+	 * : Added desktop file to be installed in xdt/autostart
+
 2009-03-14 16:40 Ali aliov at xfce.org 
 	 * : Idle function to reduce screen luminosity after a certain time+fix a bug in the adapter code
 

Modified: xfce4-power-manager/trunk/configure.ac.in
===================================================================
--- xfce4-power-manager/trunk/configure.ac.in	2009-03-14 15:40:09 UTC (rev 6903)
+++ xfce4-power-manager/trunk/configure.ac.in	2009-03-14 16:23:43 UTC (rev 6904)
@@ -146,14 +146,17 @@
 po/Makefile.in
 ])
 
-echo "----------------------------------------"
-echo 	 "   Build Configuration"
-echo 
-echo "   DPMS         support    $have_dpms      "
-echo "   Notification support    $LIBNOTIFY_FOUND"
-echo "   Build panel  plugins    $build_panel_plugins"
-echo "   Debug        support    $enable_debug   "
-echo
-echo "----------------------------------------"  
-echo
-echo "Configuration finished, type make to compile"
+echo "
+--------------------------------------------------
+ 	    Xfce Power Manager $VERSION
+	======================================
+ 
+	prefix:			$prefix
+	xdg autostart:		$sysconfdir/xdg/autostart
+   	DPMS         support:   $have_dpms
+   	Notification support:   $LIBNOTIFY_FOUND
+  	Build panel  plugins:   $build_panel_plugins
+   	Debug        support:   $enable_debug
+--------------------------------------------------
+
+Configuration finished, type make to compile"

Modified: xfce4-power-manager/trunk/src/Makefile.am
===================================================================
--- xfce4-power-manager/trunk/src/Makefile.am	2009-03-14 15:40:09 UTC (rev 6903)
+++ xfce4-power-manager/trunk/src/Makefile.am	2009-03-14 16:23:43 UTC (rev 6904)
@@ -126,9 +126,15 @@
 
 endif
 
+ at INTLTOOL_DESKTOP_RULE@
+autostartdir = $(sysconfdir)/xdg/autostart
+autostart_in_files = xfce-power-manager.desktop.in
+autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
 
 EXTRA_DIST = 					\
 	xfpm-marshal.list
 
 DISTCLEANFILES =				\
-	$(BUILT_SOURCES)
\ No newline at end of file
+	$(BUILT_SOURCES)			\
+	xfce-power-manager.desktop
+

Modified: xfce4-power-manager/trunk/src/xfpm-adapter.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-adapter.c	2009-03-14 15:40:09 UTC (rev 6903)
+++ xfce4-power-manager/trunk/src/xfpm-adapter.c	2009-03-14 16:23:43 UTC (rev 6904)
@@ -157,6 +157,13 @@
     return adapter;
 }
 
+gboolean          xfpm_adapter_get_presence    (XfpmAdapter *adapter)
+{
+    g_return_val_if_fail (XFPM_IS_ADAPTER (adapter), FALSE);
+    
+    return adapter->priv->present;
+}
+
 void xfpm_adapter_set_visible (XfpmAdapter *adapter, gboolean visible)
 {
     g_return_if_fail ( XFPM_IS_ADAPTER (adapter));

Modified: xfce4-power-manager/trunk/src/xfpm-main.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-main.c	2009-03-14 15:40:09 UTC (rev 6903)
+++ xfce4-power-manager/trunk/src/xfpm-main.c	2009-03-14 16:23:43 UTC (rev 6904)
@@ -50,78 +50,6 @@
              "Licensed under the GNU GPL.\n\n"), VERSION);
 }
 
-static void
-autostart()
-{
-    const gchar *home;
-    
-    if ( ( home = getenv("HOME")) == NULL )
-    {
-        xfpm_popup_message(_("Xfce Power Manager"),
-                           _("Unable to read your home directory environment variable,"\
-						    " autostart option may not work"),
-                           GTK_MESSAGE_INFO);
-        g_warning("Unable to read HOME environment variable, autostart will not work\n");
-        return;
-    }
-    
-    gchar *file;
-    file = g_strdup_printf("%s/.config/autostart",home);
-    
-    if ( !g_file_test(file,G_FILE_TEST_IS_DIR) )
-    {
-        g_mkdir_with_parents(file,0700);
-    }
-    
-    file = g_strdup_printf("%s/xfce4-power-manager.desktop",file);
-    
-    if ( g_file_test(file,G_FILE_TEST_EXISTS) )
-    {
-        g_free(file);
-        return;
-    }
-    
-    GKeyFile *key;
-    GError *error = NULL;
-    
-    key = g_key_file_new();
-    
-    g_key_file_set_value(key,"Desktop Entry","Version","1.0");
-    g_key_file_set_string(key,"Desktop Entry","Type","Application");    
-    g_key_file_set_string(key,"Desktop Entry","Name","Xfce4 Power Manager"); 
-    g_key_file_set_string(key,"Desktop Entry","Icon","gpm-ac-adapter"); 
-    g_key_file_set_string(key,"Desktop Entry","Exec","xfce4-power-manager"); 
-    g_key_file_set_boolean(key,"Desktop Entry","StartupNotify",FALSE); 
-    g_key_file_set_boolean(key,"Desktop Entry","Terminal",FALSE); 
-    g_key_file_set_boolean(key,"Desktop Entry","Hidden",FALSE); 
-    g_key_file_set_string (key, "Desktop Entry", "OnlyShowIn", "XFCE");
-    
-    gchar *content = g_key_file_to_data(key,NULL,&error);
-    
-    if ( error )
-    {
-        g_critical("%s\n",error->message);
-        g_error_free(error);
-        g_free(file);
-        g_key_file_free(key);
-        return;
-    }
-    
-    g_file_set_contents(file,content,-1,&error);
-    
-    if ( error )
-    {
-        g_critical("Unable to set content for the autostart desktop file%s\n",error->message);
-        g_error_free(error);
-        g_free(file);
-        g_key_file_free(key);
-        return;
-    }
-    
-    g_free(file);
-    g_key_file_free(key);
-}
-
 int main(int argc, char **argv)
 {
     xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
@@ -249,7 +177,6 @@
     else
     {	
 	TRACE("Starting the power manager\n");
-	autostart();
     	XfpmManager *manager;
     	manager = xfpm_manager_new(bus);
     	xfpm_manager_start(manager);

Modified: xfce4-power-manager/trunk/src/xfpm-supply.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-supply.c	2009-03-14 15:40:09 UTC (rev 6903)
+++ xfce4-power-manager/trunk/src/xfpm-supply.c	2009-03-14 16:23:43 UTC (rev 6904)
@@ -565,8 +565,8 @@
     if ( !supply->priv->adapter_found )
     	g_critical ("Callback from the adapter object but no adapter found in the system\n");
 	
+    
     supply->priv->adapter_present = present;
-    
     xfpm_supply_set_adapter_presence (supply);
     
     g_signal_emit (G_OBJECT(supply), signals[ON_BATTERY], 0, !supply->priv->adapter_present);
@@ -594,8 +594,6 @@
     
     xfpm_battery_set_show_icon (battery, supply->priv->show_icon);
     
-    g_print("Adapter %d\n", supply->priv->adapter_present );
-    
     xfpm_battery_set_adapter_presence (battery, supply->priv->adapter_present);
     xfpm_battery_set_critical_level (battery, supply->priv->critical_level);
     g_hash_table_insert (supply->priv->hash, g_strdup(udi), battery);
@@ -691,8 +689,10 @@
     supply->priv->adapter_found = TRUE;
     
     supply->priv->adapter = xfpm_adapter_new (device);
-	g_signal_connect (supply->priv->adapter, "adapter-changed", 
-			  G_CALLBACK(xfpm_supply_adapter_changed_cb), supply);
+    g_signal_connect (supply->priv->adapter, "adapter-changed", 
+		      G_CALLBACK(xfpm_supply_adapter_changed_cb), supply);
+    
+    supply->priv->adapter_present = xfpm_adapter_get_presence (supply->priv->adapter);
 }
 
 static void




More information about the Goodies-commits mailing list