[Xfce4-commits] [panel-plugins/xfce4-sensors-plugin] 01/02: - cleanup of uncommented lines in makefile stuff - applied patch for bug 11252

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

timystery pushed a commit to branch master
in repository panel-plugins/xfce4-sensors-plugin.

commit 0894c3814ad672d1df82e238b89458216d713798
Author: Fabian <timystery at arcor.de>
Date:   Wed Feb 18 19:38:02 2015 +0100

    - cleanup of uncommented lines in makefile stuff
    - applied patch for bug 11252
---
 lib/Makefile.am               |    4 ----
 ltmain.sh                     |    4 ++--
 panel-plugin/sensors-plugin.c |   21 +++++++++++++++++----
 src/Makefile.am               |   23 -----------------------
 4 files changed, 19 insertions(+), 33 deletions(-)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index da2a69a..cef3f45 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -7,22 +7,18 @@ plugin_LTLIBRARIES = libxfce4sensors.la
 
 if HAVE_LIBSENSORS
 SENSORS_SOURCES = lmsensors.c
-# lmsensors.h
 endif
 
 if HAVE_HDDTEMP
 HDDTEMP_SOURCES = hddtemp.c
-#hddtemp.h
 endif
 
 if HAVE_ACPI
 ACPI_SOURCES = acpi.c
-#acpi.h
 endif
 
 if HAVE_NVIDIA
 NVIDIA_SOURCES = nvidia.c
-#nvidia.c
 endif
 
 libxfce4sensors_la_SOURCES =										\
diff --git a/ltmain.sh b/ltmain.sh
index bb5fa02..bffda54 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -70,7 +70,7 @@
 #         compiler:		$LTCC
 #         compiler flags:		$LTCFLAGS
 #         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1.7
+#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1.11
 #         automake:	$automake_version
 #         autoconf:	$autoconf_version
 #
@@ -80,7 +80,7 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.4.2 Debian-2.4.2-1.7"
+VERSION="2.4.2 Debian-2.4.2-1.11"
 TIMESTAMP=""
 package_revision=1.3337
 
diff --git a/panel-plugin/sensors-plugin.c b/panel-plugin/sensors-plugin.c
index fd64c06..d69ca91 100644
--- a/panel-plugin/sensors-plugin.c
+++ b/panel-plugin/sensors-plugin.c
@@ -54,6 +54,20 @@
 /* Local includes */
 #include "sensors-plugin.h"
 
+static void
+remove_gsource (guint gsource_id)
+{
+    GSource *ptr_gsource;
+    if (gsource_id != 0) 
+    {
+        ptr_gsource = g_main_context_find_source_by_id (NULL, gsource_id);
+        if (ptr_gsource != NULL) 
+        {
+            g_source_destroy (ptr_gsource);
+            gsource_id = 0;
+        }
+    }
+}
 
 static void
 sensors_set_bar_size (GtkWidget *bar, int size, int orientation)
@@ -147,7 +161,7 @@ sensors_remove_graphical_panel (t_sensors *sensors)
             if (chipfeature->show == TRUE) {
                 panel = (t_barpanel*) sensors->panels[chipNum][feature];
 
-        if (sensors->show_labels == TRUE) /* FN: FIXME; this value is already updated! */
+                if (sensors->show_labels == TRUE) /* FN: FIXME; this value is already updated! */
                     gtk_widget_destroy (panel->label);
 
                 gtk_widget_destroy (panel->progressbar);
@@ -1045,11 +1059,10 @@ sensors_free (XfcePanelPlugin *plugin, t_sensors *sensors)
     sensor_interface_cleanup();
 
     /* remove timeout functions */
-    if (sensors->timeout_id)
-        g_source_remove (sensors->timeout_id);
+    remove_gsource (sensors->timeout_id);
 
     /* double-click improvement */
-    g_source_remove (sensors->doubleclick_id);
+    remove_gsource (sensors->doubleclick_id);
 
     /* free structures and arrays */
     g_ptr_array_foreach (sensors->chips, free_chip, NULL);
diff --git a/src/Makefile.am b/src/Makefile.am
index 30b99a0..5e2622e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,12 +7,6 @@ AM_CPPFLAGS = \
 bin_PROGRAMS = \
 	xfce4-sensors
 
-#	-DG_LOG_DOMAIN=\"xfce4-sensors-plugin\"	\
-#	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
-
-# LIBS = @LIBS@ @SOLLIBS@
-# CFLAGS = @CFLAGS@
-
 xfce4_sensors_SOURCES = \
 	main.c \
 	interface.c \
@@ -29,11 +23,6 @@ xfce4_sensors_CFLAGS = \
 	@LIBXFCE4UI_CFLAGS@ \
 	@LIBXFCE4PANEL_CFLAGS@
 
-# @GTK_CFLAGS@ 	\
-# @GLIB_CFLAGS@ \
-# @LIBXFCE4PANEL_CFLAGS@
-# @LIBXFCEGUI4_CFLAGS@ 
-
 xfce4_sensors_LDFLAGS = \
 	-Wl,--no-undefined		\
 	@PLATFORM_LDFLAGS@
@@ -44,18 +33,11 @@ xfce4_sensors_LDADD = \
 	@LIBXFCE4UI_LIBS@	\
 	@LIBM@
 
-# @GTK_LIBS@ \
-# @GLIB_LIBS@ \
-# -L/usr/local/lib/xfce4/modules/ -L$(top_builddir)/lib -lxfce4sensors
-# @LIBXFCE4PANEL_LIBS@
-#@LIBXFCEGUI4_LIBS@ 											
-
 xfce4_sensors_DEPENDENCIES = \
 	$(top_builddir)/lib/libxfce4sensors.la
 
 # .desktop file
 desktop_in_files = xfce4-sensors.desktop.in
-#desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
 
 desktopdir = $(datadir)/applications
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@@ -66,8 +48,3 @@ EXTRA_DIST = \
 
 DISTCLEANFILES = \
 	$(desktop_DATA)
-
-# get full path into .desktop file
-#%.desktop.in: %.desktop.in.in
-#	sed -e "s^@PLUGIN_PATH@^$(libexecdir)/xfce4/panel-plugins^" \
-#		$< > $@

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.