[Goodies-commits] r5545 - in xfce4-sensors-plugin/trunk: . lib panel-plugin src
Fabian Nowak
timystery at xfce.org
Fri Oct 10 00:10:42 CEST 2008
Author: timystery
Date: 2008-10-09 22:10:42 +0000 (Thu, 09 Oct 2008)
New Revision: 5545
Modified:
xfce4-sensors-plugin/trunk/configure.in.in
xfce4-sensors-plugin/trunk/lib/Makefile.am
xfce4-sensors-plugin/trunk/lib/hddtemp.c
xfce4-sensors-plugin/trunk/panel-plugin/Makefile.am
xfce4-sensors-plugin/trunk/panel-plugin/sensors-plugin.c
xfce4-sensors-plugin/trunk/src/Makefile.am
xfce4-sensors-plugin/trunk/src/main.c
Log:
minor changes to few program codes enabling at least the xfce4-sensors program
Modified: xfce4-sensors-plugin/trunk/configure.in.in
===================================================================
--- xfce4-sensors-plugin/trunk/configure.in.in 2008-10-09 15:23:15 UTC (rev 5544)
+++ xfce4-sensors-plugin/trunk/configure.in.in 2008-10-09 22:10:42 UTC (rev 5545)
@@ -6,6 +6,7 @@
dnl 2007 Benedikt Meurer <benny at xfce.org>, Fabian Nowak <timystery at arcor.de>
dnl
+m4_define([libxfce4sensors_verinfo], [1:0:0])
m4_define([plugin_version],[0.10.99.6])
AC_INIT([xfce4-sensors-plugin], [plugin_version], [timystery at arcor.de])
@@ -24,6 +25,7 @@
dnl Check for basic programs
AC_PROG_CC
+AC_PROG_LD
AC_PROG_INSTALL
AC_PROG_LIBTOOL
AC_PROG_INTLTOOL
@@ -183,6 +185,12 @@
AC_CHECK_LIB(nsl, kstat_open, SOLLIBS="$SOLLIBS -linet_ntop", SOLLIBS="$SOLLIBS")
AC_SUBST(SOLLIBS)
+dnl **************************************
+dnl *** Substitute version information ***
+dnl **************************************
+LIBXFCE4SENSORS_VERINFO=libxfce4sensors_verinfo()
+AC_SUBST([LIBXFCE4SENSORS_VERINFO])
+
XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.10.0])
XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.6.0])
dnl XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.12.0])
@@ -198,10 +206,18 @@
dnl Check for debugging support
XDT_FEATURE_DEBUG()
+dnl *********************************
+dnl *** Substitute platform flags ***
+dnl *********************************
+AC_MSG_CHECKING([PLATFORM_LDFLAGS])
+AC_MSG_RESULT([$PLATFORM_LDFLAGS])
+AC_SUBST([PLATFORM_LDFLAGS])
+
AC_OUTPUT([
Makefile
xfce4-sensors-plugin.spec
lib/Makefile
+lib/libxfce4sensors-1.0.pc
panel-plugin/Makefile
src/Makefile
icons/Makefile
Modified: xfce4-sensors-plugin/trunk/lib/Makefile.am
===================================================================
--- xfce4-sensors-plugin/trunk/lib/Makefile.am 2008-10-09 15:23:15 UTC (rev 5544)
+++ xfce4-sensors-plugin/trunk/lib/Makefile.am 2008-10-09 22:10:42 UTC (rev 5545)
@@ -1,5 +1,8 @@
# $Id:$
+INCLUDES = \
+ -I$(top_srcdir)/include
+
plugindir = $(libdir)/xfce4/modules
plugin_LTLIBRARIES = libxfce4sensors.la
@@ -33,19 +36,16 @@
# types.h \
# middlelayer.h
-INCLUDES = \
- -I$(top_srcdir)/include
-
libxfce4sensors_la_CFLAGS = \
@GTK_CFLAGS@ \
@GLIB_CFLAGS@ \
@PLATFORM_CFLAGS@ \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
@LIBSENSORS_CFLAGS@ \
- @LIBXFCE4UTIL_CFLAGS@ \
- @LIBXFCEGUI4_CFLAGS@ \
@LIBXFCE4PANEL_CFLAGS@
+# @LIBXFCE4UTIL_CFLAGS@ \
+# @LIBXFCEGUI4_CFLAGS@
libxfce4sensors_la_LDFLAGS = \
-export-dynamic \
@@ -62,10 +62,11 @@
@GTK_LIBS@ \
@GLIB_LIBS@ \
@LIBSENSORS_LDFLAGS@ \
- @LIBXFCE4UTIL_LIBS@ \
- @LIBXFCEGUI4_LIBS@ \
@LIBXFCE4PANEL_LIBS@
+# @LIBXFCE4UTIL_LIBS@ \
+# @LIBXFCEGUI4_LIBS@
+
#@SOLLIBS@
# -fPIC -shared
Modified: xfce4-sensors-plugin/trunk/lib/hddtemp.c
===================================================================
--- xfce4-sensors-plugin/trunk/lib/hddtemp.c 2008-10-09 15:23:15 UTC (rev 5544)
+++ xfce4-sensors-plugin/trunk/lib/hddtemp.c 2008-10-09 22:10:42 UTC (rev 5545)
@@ -89,7 +89,7 @@
TRACE ("enters quick_message");
dialog = gtk_message_dialog_new (NULL,
- GTK_DIALOG_DESTROY_WITH_PARENT,
+ 0, /* GTK_DIALOG_DESTROY_WITH_PARENT */
GTK_MESSAGE_INFO,
GTK_BUTTONS_CLOSE,
message);
Modified: xfce4-sensors-plugin/trunk/panel-plugin/Makefile.am
===================================================================
--- xfce4-sensors-plugin/trunk/panel-plugin/Makefile.am 2008-10-09 15:23:15 UTC (rev 5544)
+++ xfce4-sensors-plugin/trunk/panel-plugin/Makefile.am 2008-10-09 22:10:42 UTC (rev 5545)
@@ -1,3 +1,5 @@
+# $Id$
+
plugindir = $(libexecdir)/xfce4/panel-plugins
plugin_PROGRAMS = xfce4-sensors-plugin
@@ -25,8 +27,6 @@
xfce4_sensors_plugin_LDFLAGS = \
$(top_builddir)/lib/libxfce4sensors.la
-
-xfce4_sensors_plugin_LDADD = \
@GTK_LIBS@ \
@GLIB_LIBS@ \
@LIBXFCE4PANEL_LIBS@ \
Modified: xfce4-sensors-plugin/trunk/panel-plugin/sensors-plugin.c
===================================================================
--- xfce4-sensors-plugin/trunk/panel-plugin/sensors-plugin.c 2008-10-09 15:23:15 UTC (rev 5544)
+++ xfce4-sensors-plugin/trunk/panel-plugin/sensors-plugin.c 2008-10-09 22:10:42 UTC (rev 5545)
@@ -37,6 +37,7 @@
/* Xfce includes */
#include <libxfce4util/libxfce4util.h>
#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4panel/xfce-panel-plugin.h>
/* Package includes */
#include <configuration.h>
@@ -1754,7 +1755,7 @@
g_strdup ( gtk_entry_get_text(GTK_ENTRY(sd->myCommandName_Entry)) );
if (! sd->sensors->plugin_config_file)
- sd->sensors->plugin_config_file = xfce_panel_plugin_save_location (plugin, TRUE)
+ sd->sensors->plugin_config_file = xfce_panel_plugin_save_location (sd->sensors->plugin, TRUE);
if (sd->sensors->plugin_config_file)
sensors_write_config (sd->sensors->plugin, sd->sensors);
@@ -1918,7 +1919,7 @@
sensors = create_sensors_control (plugin);
- sd->sensors->plugin_config_file = xfce_panel_plugin_lookup_rc_file(plugin);
+ sensors->plugin_config_file = xfce_panel_plugin_lookup_rc_file(plugin);
sensors_read_config (plugin, sensors);
/* Try to resize the sensors to fit the user settings.
@@ -1931,7 +1932,7 @@
g_signal_connect (plugin, "free-data", G_CALLBACK (sensors_free), sensors);
- sensors->plugin_config_file = xfce_panel_plugin_save_location (plugin, TRUE)
+ sensors->plugin_config_file = xfce_panel_plugin_save_location (plugin, TRUE);
g_signal_connect (plugin, "save", G_CALLBACK (sensors_write_config),
sensors);
Modified: xfce4-sensors-plugin/trunk/src/Makefile.am
===================================================================
--- xfce4-sensors-plugin/trunk/src/Makefile.am 2008-10-09 15:23:15 UTC (rev 5544)
+++ xfce4-sensors-plugin/trunk/src/Makefile.am 2008-10-09 22:10:42 UTC (rev 5545)
@@ -1,12 +1,11 @@
# $Id:$
-bin_PROGRAMS = xfce4-sensors
-
-
INCLUDES = \
- -I$(top_builddir)/include \
- -I$(top_builddir)/lib
+ -I$(top_builddir)/include
+bin_PROGRAMS = \
+ xfce4-sensors
+
# -DG_LOG_DOMAIN=\"xfce4-sensors-plugin\" \
# -DPACKAGE_LOCALE_DIR=\"$(localedir)\"
Modified: xfce4-sensors-plugin/trunk/src/main.c
===================================================================
--- xfce4-sensors-plugin/trunk/src/main.c 2008-10-09 15:23:15 UTC (rev 5544)
+++ xfce4-sensors-plugin/trunk/src/main.c 2008-10-09 22:10:42 UTC (rev 5545)
@@ -67,6 +67,9 @@
return 0;
}
+ /* start the Gtk engine */
+ gtk_init (&argc, &argv);
+
/* initialize sensor stuff */
sensors = sensors_new (NULL, NULL);
sd = g_new0 (t_sensors_dialog, 1);
@@ -76,6 +79,7 @@
window = create_main_window (sd);
/* show window and run forever */
+ gtk_widget_show_all(window);
gtk_main();
/* do the cleaning? */
More information about the Goodies-commits
mailing list