[Goodies-commits] r6582 - in xfce4-power-manager/trunk: . src
Ali Abdallah
aliov at xfce.org
Tue Jan 27 20:07:32 CET 2009
Author: aliov
Date: 2009-01-27 19:07:31 +0000 (Tue, 27 Jan 2009)
New Revision: 6582
Modified:
xfce4-power-manager/trunk/configure.ac.in
xfce4-power-manager/trunk/src/xfpm-settings.c
Log:
Fix compilation issue, show lcd brightness option when XFPM is compiled without DPMS
Modified: xfce4-power-manager/trunk/configure.ac.in
===================================================================
--- xfce4-power-manager/trunk/configure.ac.in 2009-01-27 13:26:27 UTC (rev 6581)
+++ xfce4-power-manager/trunk/configure.ac.in 2009-01-27 19:07:31 UTC (rev 6582)
@@ -4,7 +4,7 @@
m4_define([xfpm_version_micro], [0])
m4_define([xfpm_version_build], [])
m4_define([xfpm_version_tag],[])
-m4_define([xfpm_version], [xfpm_version_major().xfpm_version_minor().xfpm_version_micro()] )
+m4_define([xfpm_version], [xfpm_version_major().xfpm_version_minor().xfpm_version_micro()ifelse(xfpm_version_tag(), [svn], [xfpm_version_tag()-xfpm_version_build()], [xfpm_version_tag()])])
AC_INIT([xfce4-power-manager], [xfpm_version], [http://bugzilla.xfce.org/])
AC_PREREQ(2.50)
Modified: xfce4-power-manager/trunk/src/xfpm-settings.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-settings.c 2009-01-27 13:26:27 UTC (rev 6581)
+++ xfce4-power-manager/trunk/src/xfpm-settings.c 2009-01-27 19:07:31 UTC (rev 6582)
@@ -1108,7 +1108,7 @@
}
static GtkWidget *
-xfpm_settings_tree_view(gboolean is_laptop,gboolean ups,guint8 govs)
+xfpm_settings_tree_view(gboolean is_laptop,gboolean ups,guint8 govs,gboolean lcd)
{
GdkPixbuf *pix;
GtkWidget *view;
@@ -1183,20 +1183,28 @@
}
/// Dpms settings
-#ifdef HAVE_DPMS
- pix = xfpm_load_icon("display",38);
- gtk_list_store_append(list_store,&iter);
- if ( pix )
+ gboolean show_monitor_settings = FALSE;
+#ifdef HAVE_DPMS
+ show_monitor_settings = TRUE;
+#else
+ if ( lcd )
+ show_monitor_settings = TRUE;
+#endif
+
+ if ( show_monitor_settings )
{
- gtk_list_store_set(list_store,&iter,0,pix,1,_("Monitor Settings"),2,3,-1);
- g_object_unref(pix);
+ pix = xfpm_load_icon("display",38);
+ gtk_list_store_append(list_store,&iter);
+ if ( pix )
+ {
+ gtk_list_store_set(list_store,&iter,0,pix,1,_("Monitor Settings"),2,3,-1);
+ g_object_unref(pix);
+ }
+ else
+ {
+ gtk_list_store_set(list_store,&iter,1,_("Monitor Settings"),2,3,-1);
+ }
}
- else
- {
- gtk_list_store_set(list_store,&iter,1,_("Monitor Settings"),2,3,-1);
- }
-#endif
-
GtkTreeSelection *sel;
GtkTreePath *path;
@@ -1265,7 +1273,7 @@
gtk_box_pack_start (GTK_BOX (allbox), frame, TRUE, TRUE, SPACING);
- view = xfpm_settings_tree_view(is_laptop,ups_found,govs);
+ view = xfpm_settings_tree_view(is_laptop,ups_found,govs,lcd);
#ifndef HAVE_DPMS
if ( is_laptop || ups_found || govs )
@@ -1301,18 +1309,12 @@
gtk_notebook_append_page(GTK_NOTEBOOK(nt),box,NULL);
}
- /// Dpms settings && LCD brightness settings DPMS existence is checked above
-#ifdef HAVE_DPMS
+ /// Dpms & LCD brightness settings
+
box = xfpm_settings_monitor(channel,is_laptop,dpms_capable,lcd,ups);
gtk_notebook_append_page(GTK_NOTEBOOK(nt),box,NULL);
-#else
- if ( lcd )
- {
- box = xfpm_settings_monitor(channel,is_laptop,dpms_capable,lcd,ups);
- gtk_notebook_append_page(GTK_NOTEBOOK(nt),box,NULL);
- }
-#endif
+
GtkWidget *plug;
if ( socket_id != 0 )
{
More information about the Goodies-commits
mailing list