From 4c940e2108b050369a6ca0c51f639c2e42e0ca5f Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Tue, 8 Nov 2011 10:41:22 +0000 Subject: [PATCH] move unity code to top source dir --- configure | 3 +- configure.ac | 1 - src/Makefile.am | 5 +- src/Makefile.in | 34 ++-- src/ui_unity.c | 55 ++++++ src/ui_unity.h | 27 +++ src/unity/Makefile.am | 14 -- src/unity/Makefile.in | 500 -------------------------------------------------- src/unity/ui_unity.c | 56 ------ src/unity/ui_unity.h | 28 --- 10 files changed, 105 insertions(+), 618 deletions(-) create mode 100644 src/ui_unity.c create mode 100644 src/ui_unity.h delete mode 100644 src/unity/Makefile.am delete mode 100644 src/unity/Makefile.in delete mode 100644 src/unity/ui_unity.c delete mode 100644 src/unity/ui_unity.h diff --git a/configure b/configure index 4b3cb7c..11560f7 100755 --- a/configure +++ b/configure @@ -8552,7 +8552,7 @@ fi -ac_config_files="$ac_config_files Makefile src/Makefile src/glade/Makefile src/lib/Makefile src/unity/Makefile src/libpsensor_json/Makefile src/server/Makefile icons/hicolor/scalable/Makefile icons/hicolor/14x14/Makefile icons/hicolor/16x16/Makefile icons/hicolor/22x22/Makefile icons/hicolor/24x24/Makefile icons/hicolor/32x32/Makefile icons/hicolor/48x48/Makefile icons/hicolor/64x64/Makefile icons/ubuntu-mono-dark/status/22/Makefile icons/ubuntu-mono-light/status/22/Makefile icons/ubuntu-mono-dark/apps/22/Makefile www/Makefile po/Makefile.in tests/Makefile" +ac_config_files="$ac_config_files Makefile src/Makefile src/glade/Makefile src/lib/Makefile src/libpsensor_json/Makefile src/server/Makefile icons/hicolor/scalable/Makefile icons/hicolor/14x14/Makefile icons/hicolor/16x16/Makefile icons/hicolor/22x22/Makefile icons/hicolor/24x24/Makefile icons/hicolor/32x32/Makefile icons/hicolor/48x48/Makefile icons/hicolor/64x64/Makefile icons/ubuntu-mono-dark/status/22/Makefile icons/ubuntu-mono-light/status/22/Makefile icons/ubuntu-mono-dark/apps/22/Makefile www/Makefile po/Makefile.in tests/Makefile" for ac_prog in help2man @@ -9386,7 +9386,6 @@ do "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "src/glade/Makefile") CONFIG_FILES="$CONFIG_FILES src/glade/Makefile" ;; "src/lib/Makefile") CONFIG_FILES="$CONFIG_FILES src/lib/Makefile" ;; - "src/unity/Makefile") CONFIG_FILES="$CONFIG_FILES src/unity/Makefile" ;; "src/libpsensor_json/Makefile") CONFIG_FILES="$CONFIG_FILES src/libpsensor_json/Makefile" ;; "src/server/Makefile") CONFIG_FILES="$CONFIG_FILES src/server/Makefile" ;; "icons/hicolor/scalable/Makefile") CONFIG_FILES="$CONFIG_FILES icons/hicolor/scalable/Makefile" ;; diff --git a/configure.ac b/configure.ac index d032e80..79b4675 100644 --- a/configure.ac +++ b/configure.ac @@ -227,7 +227,6 @@ AC_CONFIG_FILES([ src/Makefile src/glade/Makefile src/lib/Makefile - src/unity/Makefile src/libpsensor_json/Makefile src/server/Makefile icons/hicolor/scalable/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 2ee2568..18f8d0a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = lib unity glade +SUBDIRS = lib glade AM_LDFLAGS = -Wl,--as-needed @@ -68,8 +68,9 @@ LIBS += $(LIBATIADL_LIBS) endif if UNITY +psensor_SOURCES += ui_unity.h ui_unity.c AM_CPPFLAGS += $(UNITY_CFLAGS) -LIBS += unity/libpsensor_unity.a $(UNITY_LIBS) +LIBS += $(UNITY_LIBS) endif if CURL diff --git a/src/Makefile.in b/src/Makefile.in index 8861f68..279ae2c 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -49,11 +49,12 @@ bin_PROGRAMS = psensor$(EXEEXT) @NVIDIA_TRUE@am__append_12 = $(NVIDIA_LIBS) @LIBATIADL_TRUE@am__append_13 = $(LIBATIADL_CFLAGS) @LIBATIADL_TRUE@am__append_14 = $(LIBATIADL_LIBS) -@UNITY_TRUE@am__append_15 = $(UNITY_CFLAGS) -@UNITY_TRUE@am__append_16 = unity/libpsensor_unity.a $(UNITY_LIBS) -@CURL_TRUE@@JSON_TRUE@am__append_17 = rsensor.h rsensor.c -@CURL_TRUE@@JSON_TRUE@am__append_18 = $(CURL_LIBS) $(JSON_LIBS) -@CURL_TRUE@@JSON_TRUE@am__append_19 = $(CURL_CFLAGS) $(JSON_CFLAGS) +@UNITY_TRUE@am__append_15 = ui_unity.h ui_unity.c +@UNITY_TRUE@am__append_16 = $(UNITY_CFLAGS) +@UNITY_TRUE@am__append_17 = $(UNITY_LIBS) +@CURL_TRUE@@JSON_TRUE@am__append_18 = rsensor.h rsensor.c +@CURL_TRUE@@JSON_TRUE@am__append_19 = $(CURL_LIBS) $(JSON_LIBS) +@CURL_TRUE@@JSON_TRUE@am__append_20 = $(CURL_CFLAGS) $(JSON_CFLAGS) subdir = src DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in @@ -71,15 +72,17 @@ am__psensor_SOURCES_DIST = compat.h cfg.h cfg.c graph.h graph.c main.c \ ui.h ui.c ui_color.h ui_color.c ui_graph.h ui_graph.c \ ui_pref.h ui_pref.c ui_sensorlist.h ui_sensorlist.c \ ui_sensorpref.h ui_sensorpref.c ui_notify.h ui_notify.c \ - ui_appindicator.h ui_appindicator.c rsensor.h rsensor.c + ui_appindicator.h ui_appindicator.c ui_unity.h ui_unity.c \ + rsensor.h rsensor.c @LIBNOTIFY_TRUE@am__objects_1 = ui_notify.$(OBJEXT) @APPINDICATOR_TRUE@am__objects_2 = ui_appindicator.$(OBJEXT) -@CURL_TRUE@@JSON_TRUE@am__objects_3 = rsensor.$(OBJEXT) +@UNITY_TRUE@am__objects_3 = ui_unity.$(OBJEXT) +@CURL_TRUE@@JSON_TRUE@am__objects_4 = rsensor.$(OBJEXT) am_psensor_OBJECTS = cfg.$(OBJEXT) graph.$(OBJEXT) main.$(OBJEXT) \ ui.$(OBJEXT) ui_color.$(OBJEXT) ui_graph.$(OBJEXT) \ ui_pref.$(OBJEXT) ui_sensorlist.$(OBJEXT) \ ui_sensorpref.$(OBJEXT) $(am__objects_1) $(am__objects_2) \ - $(am__objects_3) + $(am__objects_3) $(am__objects_4) psensor_OBJECTS = $(am_psensor_OBJECTS) psensor_LDADD = $(LDADD) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) @@ -130,7 +133,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ distdir ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = lib unity glade libpsensor_json server +DIST_SUBDIRS = lib glade libpsensor_json server DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -212,8 +215,8 @@ LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = lib/libpsensor.a $(GTK_LIBS) $(GCONF_LIBS) $(SENSORS_LIBS) \ $(am__append_4) $(am__append_6) $(am__append_9) \ - $(am__append_12) $(am__append_14) $(am__append_16) \ - $(am__append_18) + $(am__append_12) $(am__append_14) $(am__append_17) \ + $(am__append_19) LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ @@ -304,20 +307,20 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = lib unity glade $(am__append_1) $(am__append_2) +SUBDIRS = lib glade $(am__append_1) $(am__append_2) AM_LDFLAGS = -Wl,--as-needed AM_CPPFLAGS = -Wall -pedantic -Werror \ -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\" \ -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/unity \ $(GTK_CFLAGS) $(GCONF_CFLAGS) $(SENSORS_CFLAGS) \ $(am__append_3) $(am__append_7) $(am__append_10) \ - $(am__append_11) $(am__append_13) $(am__append_15) \ - $(am__append_19) + $(am__append_11) $(am__append_13) $(am__append_16) \ + $(am__append_20) psensor_SOURCES = compat.h cfg.h cfg.c graph.h graph.c main.c ui.h \ ui.c ui_color.h ui_color.c ui_graph.h ui_graph.c ui_pref.h \ ui_pref.c ui_sensorlist.h ui_sensorlist.c ui_sensorpref.h \ ui_sensorpref.c $(am__append_5) $(am__append_8) \ - $(am__append_17) + $(am__append_15) $(am__append_18) dist_man_MANS = psensor.1 EXTRA_DIST = description.txt all: all-recursive @@ -413,6 +416,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui_pref.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui_sensorlist.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui_sensorpref.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui_unity.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/src/ui_unity.c b/src/ui_unity.c new file mode 100644 index 0000000..c8774ac --- /dev/null +++ b/src/ui_unity.c @@ -0,0 +1,55 @@ +/* + * Copyright (C) 2010-2011 jeanfi@gmail.com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA + */ +#include + +#include "psensor.h" + +static int initialized; +static UnityLauncherEntry *psensor_entry; +static unsigned int last_visible = -1; + +void ui_unity_launcher_entry_update(struct psensor **sensors, + unsigned int show) +{ + if (!initialized) { + psensor_entry = unity_launcher_entry_get_for_desktop_file + ("psensor.desktop"); + + unity_launcher_entry_set_count(psensor_entry, 0); + initialized = 1; + } + + if (last_visible != show) { + if (show) + unity_launcher_entry_set_count_visible(psensor_entry, + TRUE); + else + unity_launcher_entry_set_count_visible(psensor_entry, + FALSE); + last_visible = show; + } + + if (sensors && *sensors) { + double v; + + v = psensor_get_max_current_value(sensors, SENSOR_TYPE_TEMP); + + unity_launcher_entry_set_count(psensor_entry, v); + } +} diff --git a/src/ui_unity.h b/src/ui_unity.h new file mode 100644 index 0000000..5a0a6ec --- /dev/null +++ b/src/ui_unity.h @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2010-2011 jeanfi@gmail.com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA + */ +#ifndef _PSENSOR_UI_UNITY_H_ +#define _PSENSOR_UI_UNITY_H_ + +#include "psensor.h" + +void ui_unity_launcher_entry_update(struct psensor **sensors, + unsigned int show); + +#endif diff --git a/src/unity/Makefile.am b/src/unity/Makefile.am deleted file mode 100644 index 2e7c8ea..0000000 --- a/src/unity/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -if UNITY -noinst_LIBRARIES = libpsensor_unity.a - -# no -pedantic because not supported by dee.h -libpsensor_unity_a_CFLAGS = -Wall -Werror - -libpsensor_unity_a_SOURCES = \ - ui_unity.h ui_unity.c - -AM_CPPFLAGS = $(UNITY_CFLAGS) \ - -I$(top_srcdir)/src/lib - -LIBS += $(UNITY_LIBS) -endif \ No newline at end of file diff --git a/src/unity/Makefile.in b/src/unity/Makefile.in deleted file mode 100644 index 50a302d..0000000 --- a/src/unity/Makefile.in +++ /dev/null @@ -1,500 +0,0 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -@UNITY_TRUE@am__append_1 = $(UNITY_LIBS) -subdir = src/unity -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -LIBRARIES = $(noinst_LIBRARIES) -AR = ar -ARFLAGS = cru -libpsensor_unity_a_AR = $(AR) $(ARFLAGS) -libpsensor_unity_a_LIBADD = -am__libpsensor_unity_a_SOURCES_DIST = ui_unity.h ui_unity.c -@UNITY_TRUE@am_libpsensor_unity_a_OBJECTS = \ -@UNITY_TRUE@ libpsensor_unity_a-ui_unity.$(OBJEXT) -libpsensor_unity_a_OBJECTS = $(am_libpsensor_unity_a_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(libpsensor_unity_a_SOURCES) -DIST_SOURCES = $(am__libpsensor_unity_a_SOURCES_DIST) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ -APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CURL_CFLAGS = @CURL_CFLAGS@ -CURL_LIBS = @CURL_LIBS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -GCONF_CFLAGS = @GCONF_CFLAGS@ -GCONF_LIBS = @GCONF_LIBS@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ -GMSGFMT = @GMSGFMT@ -GMSGFMT_015 = @GMSGFMT_015@ -GREP = @GREP@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ -GTOP_CFLAGS = @GTOP_CFLAGS@ -GTOP_LIBS = @GTOP_LIBS@ -HELP2MAN = @HELP2MAN@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLLIBS = @INTLLIBS@ -INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ -JSON_CFLAGS = @JSON_CFLAGS@ -JSON_LIBS = @JSON_LIBS@ -LDFLAGS = @LDFLAGS@ -LIBATIADL_CFLAGS = @LIBATIADL_CFLAGS@ -LIBATIADL_LIBS = @LIBATIADL_LIBS@ -LIBICONV = @LIBICONV@ -LIBINTL = @LIBINTL@ -LIBMICROHTTPD_CFLAGS = @LIBMICROHTTPD_CFLAGS@ -LIBMICROHTTPD_LIBS = @LIBMICROHTTPD_LIBS@ -LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ -LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ $(am__append_1) -LTLIBICONV = @LTLIBICONV@ -LTLIBINTL = @LTLIBINTL@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -MSGFMT = @MSGFMT@ -MSGFMT_015 = @MSGFMT_015@ -MSGMERGE = @MSGMERGE@ -NVIDIA_CFLAGS = @NVIDIA_CFLAGS@ -NVIDIA_LIBS = @NVIDIA_LIBS@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POSUB = @POSUB@ -RANLIB = @RANLIB@ -SENSORS_LIBS = @SENSORS_LIBS@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -UNITY_CFLAGS = @UNITY_CFLAGS@ -UNITY_LIBS = @UNITY_LIBS@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -X11_CFLAGS = @X11_CFLAGS@ -X11_LIBS = @X11_LIBS@ -XEXT_CFLAGS = @XEXT_CFLAGS@ -XEXT_LIBS = @XEXT_LIBS@ -XGETTEXT = @XGETTEXT@ -XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ -XMKMF = @XMKMF@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -@UNITY_TRUE@noinst_LIBRARIES = libpsensor_unity.a - -# no -pedantic because not supported by dee.h -@UNITY_TRUE@libpsensor_unity_a_CFLAGS = -Wall -Werror -@UNITY_TRUE@libpsensor_unity_a_SOURCES = \ -@UNITY_TRUE@ ui_unity.h ui_unity.c - -@UNITY_TRUE@AM_CPPFLAGS = $(UNITY_CFLAGS) \ -@UNITY_TRUE@ -I$(top_srcdir)/src/lib - -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/unity/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/unity/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -clean-noinstLIBRARIES: - -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libpsensor_unity.a: $(libpsensor_unity_a_OBJECTS) $(libpsensor_unity_a_DEPENDENCIES) - -rm -f libpsensor_unity.a - $(libpsensor_unity_a_AR) libpsensor_unity.a $(libpsensor_unity_a_OBJECTS) $(libpsensor_unity_a_LIBADD) - $(RANLIB) libpsensor_unity.a - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpsensor_unity_a-ui_unity.Po@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -libpsensor_unity_a-ui_unity.o: ui_unity.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpsensor_unity_a_CFLAGS) $(CFLAGS) -MT libpsensor_unity_a-ui_unity.o -MD -MP -MF $(DEPDIR)/libpsensor_unity_a-ui_unity.Tpo -c -o libpsensor_unity_a-ui_unity.o `test -f 'ui_unity.c' || echo '$(srcdir)/'`ui_unity.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libpsensor_unity_a-ui_unity.Tpo $(DEPDIR)/libpsensor_unity_a-ui_unity.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ui_unity.c' object='libpsensor_unity_a-ui_unity.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpsensor_unity_a_CFLAGS) $(CFLAGS) -c -o libpsensor_unity_a-ui_unity.o `test -f 'ui_unity.c' || echo '$(srcdir)/'`ui_unity.c - -libpsensor_unity_a-ui_unity.obj: ui_unity.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpsensor_unity_a_CFLAGS) $(CFLAGS) -MT libpsensor_unity_a-ui_unity.obj -MD -MP -MF $(DEPDIR)/libpsensor_unity_a-ui_unity.Tpo -c -o libpsensor_unity_a-ui_unity.obj `if test -f 'ui_unity.c'; then $(CYGPATH_W) 'ui_unity.c'; else $(CYGPATH_W) '$(srcdir)/ui_unity.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libpsensor_unity_a-ui_unity.Tpo $(DEPDIR)/libpsensor_unity_a-ui_unity.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ui_unity.c' object='libpsensor_unity_a-ui_unity.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpsensor_unity_a_CFLAGS) $(CFLAGS) -c -o libpsensor_unity_a-ui_unity.obj `if test -f 'ui_unity.c'; then $(CYGPATH_W) 'ui_unity.c'; else $(CYGPATH_W) '$(srcdir)/ui_unity.c'; fi` - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LIBRARIES) -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-noinstLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-am - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/src/unity/ui_unity.c b/src/unity/ui_unity.c deleted file mode 100644 index 8db9572..0000000 --- a/src/unity/ui_unity.c +++ /dev/null @@ -1,56 +0,0 @@ -/* - Copyright (C) 2010-2011 jeanfi@gmail.com - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301 USA -*/ - -#include - -#include "psensor.h" - -static int initialized; -static UnityLauncherEntry *psensor_entry; -static unsigned int last_visible = -1; - -void ui_unity_launcher_entry_update(struct psensor **sensors, - unsigned int show) -{ - if (!initialized) { - psensor_entry = unity_launcher_entry_get_for_desktop_file - ("psensor.desktop"); - - unity_launcher_entry_set_count(psensor_entry, 0); - initialized = 1; - } - - if (last_visible != show) { - if (show) - unity_launcher_entry_set_count_visible(psensor_entry, - TRUE); - else - unity_launcher_entry_set_count_visible(psensor_entry, - FALSE); - last_visible = show; - } - - if (sensors && *sensors) { - double v; - - v = psensor_get_max_current_value(sensors, SENSOR_TYPE_TEMP); - - unity_launcher_entry_set_count(psensor_entry, v); - } -} diff --git a/src/unity/ui_unity.h b/src/unity/ui_unity.h deleted file mode 100644 index 9ec3ddf..0000000 --- a/src/unity/ui_unity.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - Copyright (C) 2010-2011 jeanfi@gmail.com - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301 USA -*/ - -#ifndef _PSENSOR_UI_UNITY_H_ -#define _PSENSOR_UI_UNITY_H_ - -#include "psensor.h" - -void ui_unity_launcher_entry_update(struct psensor **sensors, - unsigned int show); - -#endif -- 2.7.4