diff options
85 files changed, 2033 insertions, 647 deletions
@@ -1,4 +1,4 @@ -GNOME Sensors Applet +MATE Sensors Applet Author: Alex Murray <[email protected]> Contributors: Nathan Hand <[email protected]> @@ -229,7 +229,7 @@ be a consequence of the rest of this License. 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding +may add an explicit geomraphical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. @@ -1,6 +1,6 @@ 2010-06-24 Alex Murray <[email protected]> - * GNOME Sensors Applet Version 2.27 Released + * MATE Sensors Applet Version 2.27 Released 2010-06-23 Alex Murray <[email protected]> @@ -13,7 +13,7 @@ 2010-06-15 Alex Murray <[email protected]> - * GNOME Sensors Applet Version 2.2.6 Released + * MATE Sensors Applet Version 2.2.6 Released * Rename and port devkit-disks plugin to udisks interface as devkit-disks no longer exists @@ -22,7 +22,7 @@ 2009-11-21 Alex Murray <[email protected]> - * GNOME Sensors Applet Version 2.2.5 Released + * MATE Sensors Applet Version 2.2.5 Released * Port devicekit-disks plugin to use latest devicekit DBus API - now requires libatasmart as a dependency as a result (Patch contributed by @@ -50,21 +50,21 @@ 2009-04-21 Alex Murray <[email protected]> - * GNOME Sensors Applet Version 2.2.4 Released + * MATE Sensors Applet Version 2.2.4 Released * Fix bug where changing temperature scale would convert limits of non-temperature sensors (Fixes Ubuntu bug #249955) 2009-03-15 Alex Murray <[email protected]> - * GNOME Sensors Applet Version 2.2.3 Released + * MATE Sensors Applet Version 2.2.3 Released * Fix error retrieving sensor value if compiled against old libsensors library version (libsensors API version < 4) (Fixes bug #2687451). 2009-03-08 Alex Murray <[email protected]> - * GNOME Sensors Applet Version 2.2.2 Released + * MATE Sensors Applet Version 2.2.2 Released * Avoid using sensors_parse_chip_name in libsensors plugin each time we need to get a sensor's value since it leaks memory. (Fixes bug @@ -99,13 +99,13 @@ 2007-12-26 Alex Murray <[email protected]> - * GNOME Sensors Applet Version 2.2.1 Released + * MATE Sensors Applet Version 2.2.1 Released * Fixed bug in libsensors4 plugin [ 1858005 ] segfault on startup 2007-12-24 Alex Murray <[email protected]> - * GNOME Sensors Applet Version 2.2.0 Released + * MATE Sensors Applet Version 2.2.0 Released 2007-12-23 Alex Murray <[email protected]> @@ -121,22 +121,22 @@ * Implemented a plugin system, so all interface specific code are compiled into separated plugin modules, allowing them to be - shipped separately from the main GNOME Sensors Applet program, to + shipped separately from the main MATE Sensors Applet program, to fix Debian bug #375179, and allow the NVIDIA plugin to be split into a separate package if needed. 2007-12-11 Alex Murray <[email protected]> - * GNOME Sensors Applet Version 2.0.1 Released + * MATE Sensors Applet Version 2.0.1 Released * Use new GTK tooltip API when possible - * Update GTK icon cache on uninstall to comply with GNOME bug + * Update GTK icon cache on uninstall to comply with MATE bug #362604 * Use g_timeout_add_seconds() when possible to save power - * GNOME Sensors Applet Version 2.0.0 Released + * MATE Sensors Applet Version 2.0.0 Released * src/libsensors-sensors-interface.c: Added support for libsensors4 API - to be shipped with upcoming Fedora 9 and Ubuntu @@ -144,7 +144,7 @@ 2007-10-25 Alex Murray <[email protected]> - * GNOME Sensors Applet Version 1.8.2 Released + * MATE Sensors Applet Version 1.8.2 Released * Updated README to reflect re-licensing of icons under CC-BY-SA 3.0 (https://bugs.launchpad.net/ubuntu/+source/sensors-applet/+bug/69800/comments/12) @@ -156,7 +156,7 @@ 2007-07-04 Alex Murray <[email protected]> - * GNOME Sensors Applet Version 1.8.1 Released + * MATE Sensors Applet Version 1.8.1 Released * Fixed bug [ 1738013 ] "38 °C" instead of "38°C" @@ -164,7 +164,7 @@ 2007-07-03 Alex Murray <[email protected]> - * GNOME Sensors Applet Version 1.8.0 Released + * MATE Sensors Applet Version 1.8.0 Released 2007-07-02 Alex Murray <[email protected]> @@ -178,7 +178,7 @@ 2007-04-27 Alex Murray <[email protected]> - * GNOME Sensors Applet Version 1.7.12 Released + * MATE Sensors Applet Version 1.7.12 Released * Fixed bug [ 1705371 ] - Don't see second core on Core/Core 2 @@ -189,7 +189,7 @@ 2007-02-10 Alex Murray <[email protected]> - * GNOME Sensors Applet Version 1.7.11 Released + * MATE Sensors Applet Version 1.7.11 Released 2007-02-08 Alex Murray <[email protected]> @@ -221,7 +221,7 @@ 2006-11-22 Alex Murray <[email protected]> - * GNOME Sensors Applet Version 1.7.10 Released + * MATE Sensors Applet Version 1.7.10 Released * Fixed bug where when upgrading from a previous version, the graph size would always be restored from the previous version @@ -240,7 +240,7 @@ 2006-11-01 Alex Murray <[email protected]> - * GNOME Sensors Applet Version 1.7.9 Released + * MATE Sensors Applet Version 1.7.9 Released * Added new Tango style icons (very big thanks to epicbard) @@ -255,7 +255,7 @@ 2006-08-23 Alex Murray <[email protected]> - * GNOME Sensors Applet Version 1.7.8 Released + * MATE Sensors Applet Version 1.7.8 Released 2006-08-22 Alex Murray <[email protected]> @@ -270,7 +270,7 @@ 2006-08-20 Alex Murray <[email protected]> - * GNOME Sensors Applet Version 1.7.7 Released + * MATE Sensors Applet Version 1.7.7 Released 2006-08-19 Alex Murray <[email protected]> @@ -286,7 +286,7 @@ 2006-08-07 Alex Murray <[email protected]> - * GNOME Sensors Applet Version 1.7.6 Released + * MATE Sensors Applet Version 1.7.6 Released * Fixed crash if no sensors found (should resolve Ubuntu bug #51575) @@ -303,24 +303,24 @@ 2006-07-25 Alex Murray <[email protected]> - * Changed tooltips to display units regardless of GConf setting + * Changed tooltips to display units regardless of MateConf setting (fixes bug [ 1528198 ] tooltip & hide units). * Pack sensor rows closer together on panel 2006-07-24 Alex Murray <[email protected]> - * GNOME Sensors Applet Version 1.7.5 Released + * MATE Sensors Applet Version 1.7.5 Released * Fix for Debian bug #379361 2006-07-21 Alex Murray <[email protected]> - * GNOME Sensors Applet Version 1.7.4 Released + * MATE Sensors Applet Version 1.7.4 Released * Fixed crash when no sensors enabled. - * GNOME Sensors Applet Version 1.7.3 Released + * MATE Sensors Applet Version 1.7.3 Released * Fixed bug to allow for vertical panels - now we use a single variable Graph Size which sets the width when the applet is on top @@ -344,7 +344,7 @@ kernel module http://popies.net/sonypi/) * Added support for setting the font size and hiding the units of - labels via GConf parameters + labels via MateConf parameters * Added a section to the help manual 'Advanced Options' which details the font size and unit hiding parameters and how to set @@ -360,7 +360,7 @@ 2006-07-05 Alex Murray <[email protected]> - * GNOME Sensors Applet Version 1.7.2 Released + * MATE Sensors Applet Version 1.7.2 Released * Optimised startup time by reducing search time for new sensors * Optimised updating of active sensors to reduce overall CPU usage * Added help buttons in Preferences and Sensor Properties windows @@ -384,10 +384,10 @@ 2006-06-27 Alex Murray <[email protected]> - * GNOME Sensors Applet Version 1.7.1 Released + * MATE Sensors Applet Version 1.7.1 Released * Missed bug in libsensors interface - * GNOME Sensors Applet Version 1.7.0 released + * MATE Sensors Applet Version 1.7.0 released * Added graph display for sensors * Fixed bug where sensors would stop updating sometimes @@ -398,12 +398,12 @@ 2006-06-20 Alex Murray <[email protected]> - * Added support for libnotify + * Added support for libmatenotify 2006-06-18 Alex Murray <[email protected]> - * Removed extraneous preference options to conform more to GNOME - HIG and other GNOME applets. + * Removed extraneous preference options to conform more to MATE + HIG and other MATE applets. * Fixed bug in alignment of values when icons displayed. * Introduced smart layout of sensors within panel. @@ -419,7 +419,7 @@ 2006-06-15 Alex Murray <[email protected]> - * GNOME Sensors Applet Version 1.6.2 released + * MATE Sensors Applet Version 1.6.2 released * Added the ability to rearrange the order of sensors * Minor bug fixes @@ -439,7 +439,7 @@ 2006-03-25 Alex Murray <[email protected]> - * GNOME Sensors Applet Version 1.6.1 released + * MATE Sensors Applet Version 1.6.1 released * Refactored code base to lower CPU utilisation * Added support for dynamic temperature icons * Added support for libsensors interface (detected at compile @@ -451,7 +451,7 @@ 2006-01-08 Alex Murray <[email protected]> - * src/active-sensor.c, src/active-sensor.h, src/sensor-config-dialog.c, src/sensors-applet-gconf.c, src/sensors-applet.c, src/sensors-applet.h: + * src/active-sensor.c, src/active-sensor.h, src/sensor-config-dialog.c, src/sensors-applet-mateconf.c, src/sensors-applet.c, src/sensors-applet.h: Refactored code base to allow for lower CPU utilisation and dynamic icons. 2006-01-07 Alex Murray <[email protected]> @@ -474,7 +474,7 @@ 2006-01-04 Alex Murray <[email protected]> - * GNOME Sensors Applet 1.6 Released. + * MATE Sensors Applet 1.6 Released. 2006-01-03 Alex Murray <[email protected]> @@ -482,7 +482,7 @@ Finished help manual * src/prefs-dialog.c: - Restructured prefs-dialog to comply better with the GNOME HIG v2.0 + Restructured prefs-dialog to comply better with the MATE HIG v2.0 * src/prefs-dialog.c, src/sensor-config-dialog.c, src/sensors-applet.c, src/sensors-applet.h: Fixed memory leaks, including reference creep in pack_display. @@ -507,7 +507,7 @@ * src/sensor-config-dialog.c, src/sensors-applet.c, src/sensors-applet.h, pixmaps/Makefile.am, pixmaps/cpu-temp-icon.png: Added an icon for cpu temp - * src/prefs-dialog.c, src/prefs-dialog.h, src/sensor-config-dialog.c, src/sensors-applet-gconf.c, src/sensors-applet-gconf.h, src/sensors-applet.c, src/sensors-applet.h, SensorsApplet.server.in.in, configure.ac, pixmaps/Makefile.am: + * src/prefs-dialog.c, src/prefs-dialog.h, src/sensor-config-dialog.c, src/sensors-applet-mateconf.c, src/sensors-applet-mateconf.h, src/sensors-applet.c, src/sensors-applet.h, SensorsApplet.server.in.in, configure.ac, pixmaps/Makefile.am: Support for icons added. 2005-12-26 Alex Murray <[email protected]> @@ -517,7 +517,7 @@ 2005-12-23 Alex Murray <[email protected]> - * src/Makefile.am, src/hddtemp-sensors-interface.c, src/ibm-acpi-sensors-interface.c, src/ibm-acpi-sensors-interface.h, src/prefs-dialog.c, src/sensors-applet-gconf.c, src/sensors-applet-gconf.h, src/sensors-applet.c, src/sensors-applet.h: + * src/Makefile.am, src/hddtemp-sensors-interface.c, src/ibm-acpi-sensors-interface.c, src/ibm-acpi-sensors-interface.h, src/prefs-dialog.c, src/sensors-applet-mateconf.c, src/sensors-applet-mateconf.h, src/sensors-applet.c, src/sensors-applet.h: Added patch for ibm-acpi kernel module. @@ -563,7 +563,7 @@ Fixed bug where id's in i8k sensors were being translated but they need to stay constant. Removed the translations * help/C/sensors-applet.xml, help/Makefile.am, m4/.cvsignore, .cvsignore, Makefile.am, configure.ac: - Switched to gnome-doc-utils way of doing help docs + Switched to mate-doc-utils way of doing help docs * src/sensors-applet.c: Fixed -pedantic errors - need to do for rest of code-base @@ -614,10 +614,10 @@ * configure.ac: Updated to version 1.5.2 and updated email address - * src/acpi-sensors-interface.c, src/hddtemp-sensors-interface.c, src/i2c-proc-sensors-interface.c, src/i2c-sys-sensors-interface.c, src/i8k-sensors-interface.c, src/omnibook-sensors-interface.c, src/pmu-sys-sensors-interface.c, src/sensors-applet-gconf.c, src/sensors-applet.c, src/sensors-applet.h: + * src/acpi-sensors-interface.c, src/hddtemp-sensors-interface.c, src/i2c-proc-sensors-interface.c, src/i2c-sys-sensors-interface.c, src/i8k-sensors-interface.c, src/omnibook-sensors-interface.c, src/pmu-sys-sensors-interface.c, src/sensors-applet-mateconf.c, src/sensors-applet.c, src/sensors-applet.h: Check when each sensor is added to the list that it doesn't already exist. - On start-up, first restore any old values from gconf, then try to set up manually to see if any new sensors found. - When loading from gconf, dont worry if paths are invalid. + On start-up, first restore any old values from mateconf, then try to set up manually to see if any new sensors found. + When loading from mateconf, dont worry if paths are invalid. When adding a sensor, give indication if was successful or not. @@ -653,7 +653,7 @@ 2005-07-24 Alex Murray <[email protected]> - * sensors-applet-gconf.c: Tidied up gconf stuff + * sensors-applet-mateconf.c: Tidied up mateconf stuff * sensors-applet.c, sensors-applet.h, sensor-config-dialog.c: Fixed memory leak with alarm_command allocation by adding @@ -764,7 +764,7 @@ * sensors-applet: Version 0.7.3 Released Added cpu_vid sensor reading to i2c-sys interface. Fixed bug where icon would not be displayed on the Add to Panel - list for GNOME > 2.8 (need to specify full path to icon). + list for MATE > 2.8 (need to specify full path to icon). 2005-04-06 Alex Murray <[email protected]> diff --git a/Makefile.am b/Makefile.am index 527c8ac..92e4a14 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = sensors-applet lib plugins pixmaps po help -serverdir = $(libdir)/bonobo/servers +serverdir = $(libdir)/matecomponent/servers server_in_files = SensorsApplet.server.in server_DATA = $(server_in_files:.server.in=.server) @@ -9,7 +9,7 @@ $(server_in_files): $(server_in_files:.server.in=.server.in.in) Makefile @INTLTOOL_SERVER_RULE@ -uidir = $(datadir)/gnome-2.0/ui +uidir = $(datadir)/mate-2.0/ui ui_DATA = SensorsApplet.xml CLEANFILES = $(server_in_files) \ @@ -18,9 +18,9 @@ CLEANFILES = $(server_in_files) \ EXTRA_DIST = $(ui_DATA) \ $(server_DATA:.server=.server.in.in) \ intltool-merge.in intltool-extract.in intltool-update.in \ - gnome-doc-utils.make + mate-doc-utils.make -DISTCLEANFILES = gnome-doc-utils.make \ +DISTCLEANFILES = mate-doc-utils.make \ intltool-extract \ intltool-merge \ intltool-update diff --git a/Makefile.in b/Makefile.in index 9c0a3a2..02d1a19 100644 --- a/Makefile.in +++ b/Makefile.in @@ -164,8 +164,8 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ +MATE_CFLAGS = @MATE_CFLAGS@ +MATE_LIBS = @MATE_LIBS@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ @@ -185,8 +185,8 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBATASMART_CFLAGS = @LIBATASMART_CFLAGS@ LIBATASMART_LIBS = @LIBATASMART_LIBS@ -LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ -LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ +LIBMATENOTIFY_CFLAGS = @LIBMATENOTIFY_CFLAGS@ +LIBMATENOTIFY_LIBS = @LIBMATENOTIFY_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBSENSORS_CFLAGS = @LIBSENSORS_CFLAGS@ @@ -288,10 +288,10 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = sensors-applet lib plugins pixmaps po help -serverdir = $(libdir)/bonobo/servers +serverdir = $(libdir)/matecomponent/servers server_in_files = SensorsApplet.server.in server_DATA = $(server_in_files:.server.in=.server) -uidir = $(datadir)/gnome-2.0/ui +uidir = $(datadir)/mate-2.0/ui ui_DATA = SensorsApplet.xml CLEANFILES = $(server_in_files) \ $(server_DATA) @@ -299,9 +299,9 @@ CLEANFILES = $(server_in_files) \ EXTRA_DIST = $(ui_DATA) \ $(server_DATA:.server=.server.in.in) \ intltool-merge.in intltool-extract.in intltool-update.in \ - gnome-doc-utils.make + mate-doc-utils.make -DISTCLEANFILES = gnome-doc-utils.make \ +DISTCLEANFILES = mate-doc-utils.make \ intltool-extract \ intltool-merge \ intltool-update @@ -1,8 +1,8 @@ -GNOME Sensors Applet News +MATE Sensors Applet News -07/07/2005: GNOME Sensors Applet Version 1.0 Released. +07/07/2005: MATE Sensors Applet Version 1.0 Released. Added support for hddtemp daemon and PPC modules them_windtunnel and them_adt746x -06/30/2005 : GNOME Sensors Applet Version 1.0 Released. - This marks the first stable release of GNOME Sensors Applet. +06/30/2005 : MATE Sensors Applet Version 1.0 Released. + This marks the first stable release of MATE Sensors Applet. @@ -1,8 +1,8 @@ -GNOME Sensors Applet <http://sensors-applet.sourceforge.net/> +MATE Sensors Applet <http://sensors-applet.sourceforge.net/> Author: Alex Murray <[email protected]> -GNOME Sensors Applet is an applet for the GNOME Panel to display +MATE Sensors Applet is an applet for the MATE Panel to display readings from hardware sensors, including CPU temperature, fan speeds and voltage readings under Linux. @@ -28,11 +28,11 @@ Alarms can be set for each sensor to notify the user once a certain high or low value has been reached, and can be configured to execute a given command at given repeated intervals. -GNOME HIG v2.0 compliant +MATE HIG v2.0 compliant -libnotify[8] support for alarm conditions +libmatenotify[8] support for alarm conditions -The icons bundled as part of GNOME Sensors Applet were created by +The icons bundled as part of MATE Sensors Applet were created by epicbard[9], and are released under the Creative Commons Attribution Share-Alike license 3.0[10]. @@ -40,7 +40,7 @@ Share-Alike license 3.0[10]. Requirements - * GNOME 2.8 desktop environment, with GTK >=2.4.0 and libpanelapplet-2 + * MATE 2.8 desktop environment, with GTK >=2.4.0 and libmatepanelapplet-2 * For ACPI support: o Linux kernel 2.6 with ACPI modules loaded (CONFIG_ACPI & CONFIG_ACPI_THERMAL) @@ -70,7 +70,7 @@ Requirements o Linux kernel 2.6 with the Omnibook module * For NVIDIA graphics cards support: o NVIDIA binary driver with libNVCtrl installed (provided - with the nvidia-settings utility) (to enable support GNOME + with the nvidia-settings utility) (to enable support MATE Sensors Applet needs to be configured with the --with-nvidia flag) * For sonypi support: @@ -86,7 +86,7 @@ Debian, Fedora, Ubuntu and most standard distro users will need to do a to ensure proper installation within the correct path. -To enable support for NVIDIA GPUs GNOME Sensors Applet requires the +To enable support for NVIDIA GPUs MATE Sensors Applet requires the standard X11 headers as well as libNVCtrl (supplied by nvidia-settings), and needs to be compiled with support for NVIDIA GPUs as: diff --git a/SensorsApplet.server.in.in b/SensorsApplet.server.in.in index 0c3c82e..9fcc6c1 100644 --- a/SensorsApplet.server.in.in +++ b/SensorsApplet.server.in.in @@ -2,8 +2,8 @@ <oaf_server iid="OAFIID:SensorsApplet_Factory" type="exe" location="@LIBEXECDIR@/@PACKAGE@"> <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:Bonobo/GenericFactory:1.0"/> - <item value="IDL:Bonobo/Unknown:1.0"/> + <item value="IDL:MateComponent/GenericFactory:1.0"/> + <item value="IDL:MateComponent/Unknown:1.0"/> </oaf_attribute> <oaf_attribute name="name" type="string" value="Sensors Applet Factory"/> <oaf_attribute name="description" type="string" value="Factory to create the Sensors Applet"/> @@ -13,9 +13,9 @@ location="OAFIID:SensorsApplet_Factory"> <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/> - <item value="IDL:Bonobo/Control:1.0"/> - <item value="IDL:Bonobo/Unknown:1.0"/> + <item value="IDL:MATE/Vertigo/MatePanelAppletShell:1.0"/> + <item value="IDL:MateComponent/Control:1.0"/> + <item value="IDL:MateComponent/Unknown:1.0"/> </oaf_attribute> <oaf_attribute name="name" type="string" _value="Hardware Sensors Monitor"/> <oaf_attribute name="description" type="string" _value="Display temperature, fan speed and voltage sensor readings"/> @@ -1,4 +1,4 @@ -GNOME Sensor Applet +MATE Sensor Applet Author: Alex Murray <[email protected]> @@ -452,10 +452,10 @@ sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD fi]) -dnl GNOME_COMPILE_WARNINGS +dnl MATE_COMPILE_WARNINGS dnl Turn on many useful compiler warnings dnl For now, only works on GCC -AC_DEFUN([GNOME_COMPILE_WARNINGS],[ +AC_DEFUN([MATE_COMPILE_WARNINGS],[ dnl ****************************** dnl More compiler warnings dnl ****************************** @@ -541,7 +541,7 @@ AC_DEFUN([GNOME_COMPILE_WARNINGS],[ dnl For C++, do basically the same thing. -AC_DEFUN([GNOME_CXX_WARNINGS],[ +AC_DEFUN([MATE_CXX_WARNINGS],[ AC_ARG_ENABLE(cxx-warnings, AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] [Turn on compiler warnings.]),, @@ -594,13 +594,13 @@ AC_DEFUN([GNOME_CXX_WARNINGS],[ AC_SUBST(WARN_CXXFLAGS) ]) -dnl Do not call GNOME_DOC_DEFINES directly. It is split out from -dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself. -AC_DEFUN([GNOME_DOC_DEFINES], +dnl Do not call MATE_DOC_DEFINES directly. It is split out from +dnl MATE_DOC_INIT to allow mate-doc-utils to bootstrap off itself. +AC_DEFUN([MATE_DOC_DEFINES], [ AC_ARG_WITH([help-dir], AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),, - [with_help_dir='${datadir}/gnome/help']) + [with_help_dir='${datadir}/mate/help']) HELP_DIR="$with_help_dir" AC_SUBST(HELP_DIR) @@ -626,18 +626,18 @@ dnl disable scrollkeeper automatically for distcheck DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS" AC_SUBST(DISTCHECK_CONFIGURE_FLAGS) -AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"]) +AM_CONDITIONAL([HAVE_MATE_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"]) ]) -# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) +# MATE_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) # -AC_DEFUN([GNOME_DOC_INIT], +AC_DEFUN([MATE_DOC_INIT], [AC_REQUIRE([AC_PROG_LN_S])dnl ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1]) -AC_MSG_CHECKING([gnome-doc-utils >= $gdu_cv_version_required]) -PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required], +AC_MSG_CHECKING([mate-doc-utils >= $gdu_cv_version_required]) +PKG_CHECK_EXISTS([mate-doc-utils >= $gdu_cv_version_required], [gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no]) if test "$gdu_cv_have_gdu" = "yes"; then @@ -645,10 +645,10 @@ if test "$gdu_cv_have_gdu" = "yes"; then ifelse([$2],,[:],[$2]) else AC_MSG_RESULT([no]) - ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3]) + ifelse([$3],,[AC_MSG_ERROR([mate-doc-utils >= $gdu_cv_version_required not found])],[$3]) fi -GNOME_DOC_DEFINES +MATE_DOC_DEFINES ]) @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for GNOME Sensors Applet 2.2.7. +# Generated by GNU Autoconf 2.65 for MATE Sensors Applet 2.2.7. # # Report bugs to <[email protected]>. # @@ -699,10 +699,10 @@ MFLAGS= MAKEFLAGS= # Identity of this package. -PACKAGE_NAME='GNOME Sensors Applet' +PACKAGE_NAME='MATE Sensors Applet' PACKAGE_TARNAME='sensors-applet' PACKAGE_VERSION='2.2.7' -PACKAGE_STRING='GNOME Sensors Applet 2.2.7' +PACKAGE_STRING='MATE Sensors Applet 2.2.7' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -748,8 +748,8 @@ am__EXEEXT_TRUE LTLIBOBJS LIBOBJS PLUGIN_LIBTOOL_FLAGS -HAVE_GNOME_DOC_UTILS_FALSE -HAVE_GNOME_DOC_UTILS_TRUE +HAVE_MATE_DOC_UTILS_FALSE +HAVE_MATE_DOC_UTILS_TRUE DISTCHECK_CONFIGURE_FLAGS ENABLE_SK_FALSE ENABLE_SK_TRUE @@ -769,10 +769,10 @@ LIBSENSORS_LIBS LIBSENSORS_CFLAGS LIBSENSORS_FALSE LIBSENSORS_TRUE -LIBNOTIFY_FALSE -LIBNOTIFY_TRUE -LIBNOTIFY_LIBS -LIBNOTIFY_CFLAGS +LIBMATENOTIFY_FALSE +LIBMATENOTIFY_TRUE +LIBMATENOTIFY_LIBS +LIBMATENOTIFY_CFLAGS UDISKS_FALSE UDISKS_TRUE LIBATASMART_LIBS @@ -781,8 +781,8 @@ DBUSGLIB_LIBS DBUSGLIB_CFLAGS CAIRO_LIBS CAIRO_CFLAGS -GNOME_LIBS -GNOME_CFLAGS +MATE_LIBS +MATE_CFLAGS GTK_LIBS GTK_CFLAGS GLIB_LIBS @@ -951,7 +951,7 @@ with_gnu_ld enable_libtool_lock enable_nls enable_udisks -enable_libnotify +enable_libmatenotify with_libsensors with_nvidia with_x11 @@ -977,16 +977,16 @@ GLIB_CFLAGS GLIB_LIBS GTK_CFLAGS GTK_LIBS -GNOME_CFLAGS -GNOME_LIBS +MATE_CFLAGS +MATE_LIBS CAIRO_CFLAGS CAIRO_LIBS DBUSGLIB_CFLAGS DBUSGLIB_LIBS LIBATASMART_CFLAGS LIBATASMART_LIBS -LIBNOTIFY_CFLAGS -LIBNOTIFY_LIBS' +LIBMATENOTIFY_CFLAGS +LIBMATENOTIFY_LIBS' # Initialize some variables set by options. @@ -1528,7 +1528,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GNOME Sensors Applet 2.2.7 to adapt to many kinds of systems. +\`configure' configures MATE Sensors Applet 2.2.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1598,7 +1598,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNOME Sensors Applet 2.2.7:";; + short | recursive ) echo "Configuration of MATE Sensors Applet 2.2.7:";; esac cat <<\_ACEOF @@ -1617,7 +1617,7 @@ Optional Features: --disable-libtool-lock avoid locking (might break parallel builds) --disable-nls do not use Native Language Support --disable-udisks Disable support for udisks sensor readings via DBUS. - --enable-libnotify enable libnotify support + --enable-libmatenotify enable libmatenotify support --enable-compile-warnings=[no/minimum/yes/maximum/error] Turn on compiler warnings --enable-iso-c Try to warn if code is not ISO C @@ -1653,9 +1653,9 @@ Some influential environment variables: GLIB_LIBS linker flags for GLIB, overriding pkg-config GTK_CFLAGS C compiler flags for GTK, overriding pkg-config GTK_LIBS linker flags for GTK, overriding pkg-config - GNOME_CFLAGS - C compiler flags for GNOME, overriding pkg-config - GNOME_LIBS linker flags for GNOME, overriding pkg-config + MATE_CFLAGS + C compiler flags for MATE, overriding pkg-config + MATE_LIBS linker flags for MATE, overriding pkg-config CAIRO_CFLAGS C compiler flags for CAIRO, overriding pkg-config CAIRO_LIBS linker flags for CAIRO, overriding pkg-config @@ -1667,10 +1667,10 @@ Some influential environment variables: C compiler flags for LIBATASMART, overriding pkg-config LIBATASMART_LIBS linker flags for LIBATASMART, overriding pkg-config - LIBNOTIFY_CFLAGS - C compiler flags for LIBNOTIFY, overriding pkg-config - LIBNOTIFY_LIBS - linker flags for LIBNOTIFY, overriding pkg-config + LIBMATENOTIFY_CFLAGS + C compiler flags for LIBMATENOTIFY, overriding pkg-config + LIBMATENOTIFY_LIBS + linker flags for LIBMATENOTIFY, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1738,7 +1738,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GNOME Sensors Applet configure 2.2.7 +MATE Sensors Applet configure 2.2.7 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2109,7 +2109,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GNOME Sensors Applet $as_me 2.2.7, which was +It was created by MATE Sensors Applet $as_me 2.2.7, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -11902,9 +11902,9 @@ done GLIB_REQUIRED=2.14.0 GTK_REQUIRED=2.14.0 LIBPANEL_REQUIRED=2.0.0 -LIBGNOME_REQUIRED=2.8.0 -LIBGNOMEUI_REQUIRED=2.8.0 -LIBNOTIFY_REQUIRED=0.3.0 +LIBMATE_REQUIRED=2.8.0 +LIBMATEUI_REQUIRED=2.8.0 +LIBMATENOTIFY_REQUIRED=0.3.0 LIBCAIRO_REQUIRED=1.0.4 LIBDBUSGLIB_REQUIRED=0.80 LIBATASMART_REQUIRED=0.16 @@ -12213,26 +12213,26 @@ fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNOME" >&5 -$as_echo_n "checking for GNOME... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MATE" >&5 +$as_echo_n "checking for MATE... " >&6; } if test -n "$PKG_CONFIG"; then - if test -n "$GNOME_CFLAGS"; then - pkg_cv_GNOME_CFLAGS="$GNOME_CFLAGS" + if test -n "$MATE_CFLAGS"; then + pkg_cv_MATE_CFLAGS="$MATE_CFLAGS" else if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgnome-2.0 >= \$LIBGNOME_REQUIRED - libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED - libpanelapplet-2.0 >= \$LIBPANEL_REQUIRED\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libgnome-2.0 >= $LIBGNOME_REQUIRED - libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED - libpanelapplet-2.0 >= $LIBPANEL_REQUIRED") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmate-2.0 >= \$LIBMATE_REQUIRED + libmateui-2.0 >= \$LIBMATEUI_REQUIRED + libmatepanelapplet-2.0 >= \$LIBPANEL_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libmate-2.0 >= $LIBMATE_REQUIRED + libmateui-2.0 >= $LIBMATEUI_REQUIRED + libmatepanelapplet-2.0 >= $LIBPANEL_REQUIRED") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GNOME_CFLAGS=`$PKG_CONFIG --cflags "libgnome-2.0 >= $LIBGNOME_REQUIRED - libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED - libpanelapplet-2.0 >= $LIBPANEL_REQUIRED" 2>/dev/null` + pkg_cv_MATE_CFLAGS=`$PKG_CONFIG --cflags "libmate-2.0 >= $LIBMATE_REQUIRED + libmateui-2.0 >= $LIBMATEUI_REQUIRED + libmatepanelapplet-2.0 >= $LIBPANEL_REQUIRED" 2>/dev/null` else pkg_failed=yes fi @@ -12241,22 +12241,22 @@ else pkg_failed=untried fi if test -n "$PKG_CONFIG"; then - if test -n "$GNOME_LIBS"; then - pkg_cv_GNOME_LIBS="$GNOME_LIBS" + if test -n "$MATE_LIBS"; then + pkg_cv_MATE_LIBS="$MATE_LIBS" else if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgnome-2.0 >= \$LIBGNOME_REQUIRED - libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED - libpanelapplet-2.0 >= \$LIBPANEL_REQUIRED\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libgnome-2.0 >= $LIBGNOME_REQUIRED - libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED - libpanelapplet-2.0 >= $LIBPANEL_REQUIRED") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmate-2.0 >= \$LIBMATE_REQUIRED + libmateui-2.0 >= \$LIBMATEUI_REQUIRED + libmatepanelapplet-2.0 >= \$LIBPANEL_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libmate-2.0 >= $LIBMATE_REQUIRED + libmateui-2.0 >= $LIBMATEUI_REQUIRED + libmatepanelapplet-2.0 >= $LIBPANEL_REQUIRED") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GNOME_LIBS=`$PKG_CONFIG --libs "libgnome-2.0 >= $LIBGNOME_REQUIRED - libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED - libpanelapplet-2.0 >= $LIBPANEL_REQUIRED" 2>/dev/null` + pkg_cv_MATE_LIBS=`$PKG_CONFIG --libs "libmate-2.0 >= $LIBMATE_REQUIRED + libmateui-2.0 >= $LIBMATEUI_REQUIRED + libmatepanelapplet-2.0 >= $LIBPANEL_REQUIRED" 2>/dev/null` else pkg_failed=yes fi @@ -12275,28 +12275,28 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgnome-2.0 >= $LIBGNOME_REQUIRED - libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED - libpanelapplet-2.0 >= $LIBPANEL_REQUIRED"` + MATE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libmate-2.0 >= $LIBMATE_REQUIRED + libmateui-2.0 >= $LIBMATEUI_REQUIRED + libmatepanelapplet-2.0 >= $LIBPANEL_REQUIRED"` else - GNOME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnome-2.0 >= $LIBGNOME_REQUIRED - libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED - libpanelapplet-2.0 >= $LIBPANEL_REQUIRED"` + MATE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libmate-2.0 >= $LIBMATE_REQUIRED + libmateui-2.0 >= $LIBMATEUI_REQUIRED + libmatepanelapplet-2.0 >= $LIBPANEL_REQUIRED"` fi # Put the nasty error message in config.log where it belongs - echo "$GNOME_PKG_ERRORS" >&5 + echo "$MATE_PKG_ERRORS" >&5 - as_fn_error "Package requirements (libgnome-2.0 >= $LIBGNOME_REQUIRED - libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED - libpanelapplet-2.0 >= $LIBPANEL_REQUIRED) were not met: + as_fn_error "Package requirements (libmate-2.0 >= $LIBMATE_REQUIRED + libmateui-2.0 >= $LIBMATEUI_REQUIRED + libmatepanelapplet-2.0 >= $LIBPANEL_REQUIRED) were not met: -$GNOME_PKG_ERRORS +$MATE_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables GNOME_CFLAGS -and GNOME_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables MATE_CFLAGS +and MATE_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " "$LINENO" 5 elif test $pkg_failed = untried; then @@ -12306,15 +12306,15 @@ as_fn_error "The pkg-config script could not be found or is too old. Make sure is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables GNOME_CFLAGS -and GNOME_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables MATE_CFLAGS +and MATE_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. See \`config.log' for more details." "$LINENO" 5; } else - GNOME_CFLAGS=$pkg_cv_GNOME_CFLAGS - GNOME_LIBS=$pkg_cv_GNOME_LIBS + MATE_CFLAGS=$pkg_cv_MATE_CFLAGS + MATE_LIBS=$pkg_cv_MATE_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } : @@ -12585,42 +12585,42 @@ else fi -# support for libnotify -LIBNOTIFY_CFLAGS= -LIBNOTIFY_LIBS= +# support for libmatenotify +LIBMATENOTIFY_CFLAGS= +LIBMATENOTIFY_LIBS= # enable support even if not specifically asked for -# Check whether --enable-libnotify was given. -if test "${enable_libnotify+set}" = set; then : - enableval=$enable_libnotify; - enable_libnotify=$enableval +# Check whether --enable-libmatenotify was given. +if test "${enable_libmatenotify+set}" = set; then : + enableval=$enable_libmatenotify; + enable_libmatenotify=$enableval else - enable_libnotify="yes" + enable_libmatenotify="yes" fi -if test "x$enable_libnotify" = "xno" +if test "x$enable_libmatenotify" = "xno" then - echo "Disabling libnotify support" + echo "Disabling libmatenotify support" else pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNOTIFY" >&5 -$as_echo_n "checking for LIBNOTIFY... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBMATENOTIFY" >&5 +$as_echo_n "checking for LIBMATENOTIFY... " >&6; } if test -n "$PKG_CONFIG"; then - if test -n "$LIBNOTIFY_CFLAGS"; then - pkg_cv_LIBNOTIFY_CFLAGS="$LIBNOTIFY_CFLAGS" + if test -n "$LIBMATENOTIFY_CFLAGS"; then + pkg_cv_LIBMATENOTIFY_CFLAGS="$LIBMATENOTIFY_CFLAGS" else if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libnotify >= $LIBNOTIFY_REQUIRED") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmatenotify >= \$LIBMATENOTIFY_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libmatenotify >= $LIBMATENOTIFY_REQUIRED") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify >= $LIBNOTIFY_REQUIRED" 2>/dev/null` + pkg_cv_LIBMATENOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libmatenotify >= $LIBMATENOTIFY_REQUIRED" 2>/dev/null` else pkg_failed=yes fi @@ -12629,16 +12629,16 @@ else pkg_failed=untried fi if test -n "$PKG_CONFIG"; then - if test -n "$LIBNOTIFY_LIBS"; then - pkg_cv_LIBNOTIFY_LIBS="$LIBNOTIFY_LIBS" + if test -n "$LIBMATENOTIFY_LIBS"; then + pkg_cv_LIBMATENOTIFY_LIBS="$LIBMATENOTIFY_LIBS" else if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libnotify >= $LIBNOTIFY_REQUIRED") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmatenotify >= \$LIBMATENOTIFY_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libmatenotify >= $LIBMATENOTIFY_REQUIRED") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify >= $LIBNOTIFY_REQUIRED" 2>/dev/null` + pkg_cv_LIBMATENOTIFY_LIBS=`$PKG_CONFIG --libs "libmatenotify >= $LIBMATENOTIFY_REQUIRED" 2>/dev/null` else pkg_failed=yes fi @@ -12657,40 +12657,40 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libnotify >= $LIBNOTIFY_REQUIRED"` + LIBMATENOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libmatenotify >= $LIBMATENOTIFY_REQUIRED"` else - LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnotify >= $LIBNOTIFY_REQUIRED"` + LIBMATENOTIFY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libmatenotify >= $LIBMATENOTIFY_REQUIRED"` fi # Put the nasty error message in config.log where it belongs - echo "$LIBNOTIFY_PKG_ERRORS" >&5 + echo "$LIBMATENOTIFY_PKG_ERRORS" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - HAVE_LIBNOTIFY="no" + HAVE_LIBMATENOTIFY="no" elif test $pkg_failed = untried; then - HAVE_LIBNOTIFY="no" + HAVE_LIBMATENOTIFY="no" else - LIBNOTIFY_CFLAGS=$pkg_cv_LIBNOTIFY_CFLAGS - LIBNOTIFY_LIBS=$pkg_cv_LIBNOTIFY_LIBS + LIBMATENOTIFY_CFLAGS=$pkg_cv_LIBMATENOTIFY_CFLAGS + LIBMATENOTIFY_LIBS=$pkg_cv_LIBMATENOTIFY_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - HAVE_LIBNOTIFY="yes" + HAVE_LIBMATENOTIFY="yes" fi - if test "x$HAVE_LIBNOTIFY" = "xyes" + if test "x$HAVE_LIBMATENOTIFY" = "xyes" then -$as_echo "#define HAVE_LIBNOTIFY 1" >>confdefs.h +$as_echo "#define HAVE_LIBMATENOTIFY 1" >>confdefs.h fi fi - if test -n "$LIBNOTIFY_LIBS"; then - LIBNOTIFY_TRUE= - LIBNOTIFY_FALSE='#' + if test -n "$LIBMATENOTIFY_LIBS"; then + LIBMATENOTIFY_TRUE= + LIBMATENOTIFY_FALSE='#' else - LIBNOTIFY_TRUE='#' - LIBNOTIFY_FALSE= + LIBMATENOTIFY_TRUE='#' + LIBMATENOTIFY_FALSE= fi @@ -13220,15 +13220,15 @@ $as_echo "$complCFLAGS" >&6; } -# ================ gnome-doc-utils stuff ============= # +# ================ mate-doc-utils stuff ============= # gdu_cv_version_required=0.3.2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gnome-doc-utils >= $gdu_cv_version_required" >&5 -$as_echo_n "checking gnome-doc-utils >= $gdu_cv_version_required... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking mate-doc-utils >= $gdu_cv_version_required" >&5 +$as_echo_n "checking mate-doc-utils >= $gdu_cv_version_required... " >&6; } if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mate-doc-utils >= \$gdu_cv_version_required\""; } >&5 + ($PKG_CONFIG --exists --print-errors "mate-doc-utils >= $gdu_cv_version_required") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then @@ -13244,7 +13244,7 @@ $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error "gnome-doc-utils >= $gdu_cv_version_required not found" "$LINENO" 5 + as_fn_error "mate-doc-utils >= $gdu_cv_version_required not found" "$LINENO" 5 fi @@ -13253,7 +13253,7 @@ fi if test "${with_help_dir+set}" = set; then : withval=$with_help_dir; else - with_help_dir='${datadir}/gnome/help' + with_help_dir='${datadir}/mate/help' fi HELP_DIR="$with_help_dir" @@ -13301,11 +13301,11 @@ DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS" if test "$gdu_cv_have_gdu" = "yes"; then - HAVE_GNOME_DOC_UTILS_TRUE= - HAVE_GNOME_DOC_UTILS_FALSE='#' + HAVE_MATE_DOC_UTILS_TRUE= + HAVE_MATE_DOC_UTILS_FALSE='#' else - HAVE_GNOME_DOC_UTILS_TRUE='#' - HAVE_GNOME_DOC_UTILS_FALSE= + HAVE_MATE_DOC_UTILS_TRUE='#' + HAVE_MATE_DOC_UTILS_FALSE= fi @@ -13443,8 +13443,8 @@ if test -z "${UDISKS_TRUE}" && test -z "${UDISKS_FALSE}"; then as_fn_error "conditional \"UDISKS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${LIBNOTIFY_TRUE}" && test -z "${LIBNOTIFY_FALSE}"; then - as_fn_error "conditional \"LIBNOTIFY\" was never defined. +if test -z "${LIBMATENOTIFY_TRUE}" && test -z "${LIBMATENOTIFY_FALSE}"; then + as_fn_error "conditional \"LIBMATENOTIFY\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${LIBSENSORS_TRUE}" && test -z "${LIBSENSORS_FALSE}"; then @@ -13463,8 +13463,8 @@ if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then as_fn_error "conditional \"ENABLE_SK\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then - as_fn_error "conditional \"HAVE_GNOME_DOC_UTILS\" was never defined. +if test -z "${HAVE_MATE_DOC_UTILS_TRUE}" && test -z "${HAVE_MATE_DOC_UTILS_FALSE}"; then + as_fn_error "conditional \"HAVE_MATE_DOC_UTILS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -13875,7 +13875,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GNOME Sensors Applet $as_me 2.2.7, which was +This file was extended by MATE Sensors Applet $as_me 2.2.7, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13941,7 +13941,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GNOME Sensors Applet config.status 2.2.7 +MATE Sensors Applet config.status 2.2.7 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 01c36ec..be6cded 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ # ================= initialization =================== # -# if doing version bump - make sure you update sensors-applet-gconf +# if doing version bump - make sure you update sensors-applet-mateconf # version checking to add old version if no changes to config -AC_INIT([GNOME Sensors Applet], [2.2.7], [[email protected]], +AC_INIT([MATE Sensors Applet], [2.2.7], [[email protected]], [sensors-applet]) AC_CONFIG_SRCDIR([sensors-applet/main.c]) @@ -51,9 +51,9 @@ AC_CHECK_HEADERS( GLIB_REQUIRED=2.14.0 GTK_REQUIRED=2.14.0 LIBPANEL_REQUIRED=2.0.0 -LIBGNOME_REQUIRED=2.8.0 -LIBGNOMEUI_REQUIRED=2.8.0 -LIBNOTIFY_REQUIRED=0.3.0 +LIBMATE_REQUIRED=2.8.0 +LIBMATEUI_REQUIRED=2.8.0 +LIBMATENOTIFY_REQUIRED=0.3.0 LIBCAIRO_REQUIRED=1.0.4 LIBDBUSGLIB_REQUIRED=0.80 LIBATASMART_REQUIRED=0.16 @@ -66,11 +66,11 @@ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED) AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) -PKG_CHECK_MODULES(GNOME, libgnome-2.0 >= $LIBGNOME_REQUIRED - libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED - libpanelapplet-2.0 >= $LIBPANEL_REQUIRED) -AC_SUBST(GNOME_CFLAGS) -AC_SUBST(GNOME_LIBS) +PKG_CHECK_MODULES(MATE, libmate-2.0 >= $LIBMATE_REQUIRED + libmateui-2.0 >= $LIBMATEUI_REQUIRED + libmatepanelapplet-2.0 >= $LIBPANEL_REQUIRED) +AC_SUBST(MATE_CFLAGS) +AC_SUBST(MATE_LIBS) PKG_CHECK_MODULES(CAIRO, cairo >= $LIBCAIRO_REQUIRED) AC_SUBST(CAIRO_CFLAGS) @@ -98,33 +98,33 @@ fi AM_CONDITIONAL(UDISKS, test -n "$DBUSGLIB_CFLAGS" -a -n "$LIBATASMART_CFLAGS") -# support for libnotify -LIBNOTIFY_CFLAGS= -LIBNOTIFY_LIBS= +# support for libmatenotify +LIBMATENOTIFY_CFLAGS= +LIBMATENOTIFY_LIBS= # enable support even if not specifically asked for -AC_ARG_ENABLE(libnotify, [ --enable-libnotify enable libnotify support], [ - enable_libnotify=$enableval], [ - enable_libnotify="yes" +AC_ARG_ENABLE(libmatenotify, [ --enable-libmatenotify enable libmatenotify support], [ + enable_libmatenotify=$enableval], [ + enable_libmatenotify="yes" ]) -if test "x$enable_libnotify" = "xno" +if test "x$enable_libmatenotify" = "xno" then - echo "Disabling libnotify support" + echo "Disabling libmatenotify support" else - PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED, - HAVE_LIBNOTIFY="yes", HAVE_LIBNOTIFY="no") + PKG_CHECK_MODULES(LIBMATENOTIFY, libmatenotify >= $LIBMATENOTIFY_REQUIRED, + HAVE_LIBMATENOTIFY="yes", HAVE_LIBMATENOTIFY="no") - if test "x$HAVE_LIBNOTIFY" = "xyes" + if test "x$HAVE_LIBMATENOTIFY" = "xyes" then - AC_DEFINE(HAVE_LIBNOTIFY, 1, [libnotify available]) + AC_DEFINE(HAVE_LIBMATENOTIFY, 1, [libmatenotify available]) fi fi -AM_CONDITIONAL(LIBNOTIFY, test -n "$LIBNOTIFY_LIBS") +AM_CONDITIONAL(LIBMATENOTIFY, test -n "$LIBMATENOTIFY_LIBS") -AC_SUBST(LIBNOTIFY_CFLAGS) -AC_SUBST(LIBNOTIFY_LIBS) +AC_SUBST(LIBMATENOTIFY_CFLAGS) +AC_SUBST(LIBMATENOTIFY_LIBS) # allow user to specify libsensors support, but support it anyway if possible @@ -249,10 +249,10 @@ if test x"$XSLTPROC" = xno; then AC_MSG_ERROR([xsltproc executable not found in your path - should be installed with libxslt]) fi -GNOME_COMPILE_WARNINGS(maximum) +MATE_COMPILE_WARNINGS(maximum) -# ================ gnome-doc-utils stuff ============= # -GNOME_DOC_INIT +# ================ mate-doc-utils stuff ============= # +MATE_DOC_INIT # ==================== plugin stuff ================== # PLUGIN_LIBTOOL_FLAGS="-module -avoid-version" diff --git a/help/C/legal.xml b/help/C/legal.xml index ac97e1d..acb0b40 100644 --- a/help/C/legal.xml +++ b/help/C/legal.xml @@ -9,7 +9,7 @@ url="ghelp:fdl">link</ulink> or in the file COPYING-DOCS distributed with this manual. </para> - <para> This manual is part of a collection of GNOME manuals + <para> This manual is part of a collection of MATE manuals distributed under the GFDL. If you want to distribute this manual separately from the collection, you can do so by adding a copy of the license to the manual, as described in @@ -19,8 +19,8 @@ <para> Many of the names used by companies to distinguish their products and services are claimed as trademarks. Where those - names appear in any GNOME documentation, and the members of - the GNOME Documentation Project are made aware of those + names appear in any MATE documentation, and the members of + the MATE Documentation Project are made aware of those trademarks, then the names are in capital letters or initial capital letters. </para> diff --git a/help/C/sensors-applet.xml b/help/C/sensors-applet.xml index 6aaae92..bf9bfc1 100644 --- a/help/C/sensors-applet.xml +++ b/help/C/sensors-applet.xml @@ -5,7 +5,7 @@ <!ENTITY appletversion "1.6"> <!ENTITY manrevision "2.0"> <!ENTITY date "January 2006"> - <!ENTITY applet "GNOME Sensors Applet"> + <!ENTITY applet "MATE Sensors Applet"> <!ENTITY author-name "Alex Murray"> <!ENTITY author-email "[email protected]"> <!ENTITY project-webpage "http://sensors-applet.sourceforge.net/"> @@ -19,8 +19,8 @@ ]> <!-- (Do not remove this comment block.) - Maintained by the GNOME Documentation Project - http://developer.gnome.org/projects/gdp + Maintained by the MATE Documentation Project + http://developer.mate.org/projects/gdp Template version: 2.0 beta Template last modified Feb 06, 2003 --> @@ -51,7 +51,7 @@ not specified, the publisher/author is the same for all versions of the document. <publisher> - <publishername> GNOME Documentation Project </publishername> + <publishername> MATE Documentation Project </publishername> </publisher> --> &legal; @@ -64,10 +64,10 @@ <firstname>Alex</firstname> <surname>Murray</surname> <affiliation> - <!-- <orgname>GNOME Documentation + <!-- <orgname>MATE Documentation Project</orgname> --> <!-- The email address of the author is optional and is commented out by default. - <address> <email>[email protected]</email> </address> + <address> <email>[email protected]</email> </address> --> </affiliation> </author> @@ -78,7 +78,7 @@ <surname>Translator 1</surname> <affiliation> <orgname>Latin Translation Team</orgname> - <address> <email>[email protected]</email> </address> + <address> <email>[email protected]</email> </address> </affiliation> <contrib>Latin translation</contrib> </othercredit> @@ -89,11 +89,11 @@ <!-- Remember to remove the &manrevision; entity from the revision entries other --> <!-- than the current revision. --> - <!-- The revision numbering system for GNOME manuals is as follows: --> + <!-- The revision numbering system for MATE manuals is as follows: --> <!-- * the revision number consists of two components --> - <!-- * the first component of the revision number reflects the release version of the GNOME desktop. --> + <!-- * the first component of the revision number reflects the release version of the MATE desktop. --> <!-- * the second component of the revision number is a decimal unit that is incremented with each revision of the manual. --> - <!-- For example, if the GNOME desktop release is V2.x, the first version of the manual that --> + <!-- For example, if the MATE desktop release is V2.x, the first version of the manual that --> <!-- is written in that desktop timeframe is V2.0, the second version of the manual is V2.1, etc. --> <!-- When the desktop release version changes to V3.x, the revision number of the manual changes --> <!-- to V3.0, and so on. --> @@ -106,7 +106,7 @@ <email>&author-email;</email> </para> - <!-- <para role="publisher">GNOME Documentation Project</para> --> + <!-- <para role="publisher">MATE Documentation Project</para> --> </revdescription> </revision> </revhistory> @@ -524,7 +524,7 @@ Alarms for individual sensors must also be enabled. <para>You can play a sound when the alarm occurs by using the command <command>esdplay</command> which should be - available as part of the standard GNOME + available as part of the standard MATE installation. (Note: If this does not work, you could also try <command>aplay</command> which is the default ALSA sound player). @@ -546,17 +546,17 @@ Alarms for individual sensors must also be enabled. </term> <listitem> <para> - The program <command>zenity</command> can be used to create + The program <command>matedialog</command> can be used to create dialog boxes to be displayed on the users current display, and can thus be used to create pop-up style notifications that the alarm has occurred. - <screen><userinput><command>zenity --warning --title="Sensor Alarm" --text="Sensor Alarm occurred"</command></userinput></screen> + <screen><userinput><command>matedialog --warning --title="Sensor Alarm" --text="Sensor Alarm occurred"</command></userinput></screen> - For more information regarding Zenity please - consult the Zenity <ulink type="help" - url="ghelp:zenity">documentation</ulink>. + For more information regarding MateDialog please + consult the MateDialog <ulink type="help" + url="ghelp:matedialog">documentation</ulink>. </para> </listitem> </varlistentry> @@ -571,9 +571,9 @@ Alarms for individual sensors must also be enabled. Multiple commands can be executed one after the other using the "&&" construct to separate them. To play a sound and pop-up a dialog via - Zenity the follow command can be used: + MateDialog the follow command can be used: - <screen><userinput><command>esdplay /usr/share/sounds/gnibbles/gobble.wav && zenity --warning --title="Sensor Alarm" --text="Sensor Alarm occurred"</command></userinput></screen> + <screen><userinput><command>esdplay /usr/share/sounds/gnibbles/gobble.wav && matedialog --warning --title="Sensor Alarm" --text="Sensor Alarm occurred"</command></userinput></screen> </para> </listitem> @@ -613,25 +613,25 @@ Alarms for individual sensors must also be enabled. <title>Advanced Options</title> <para>There are a number of advanced options which can be set to customize the display of sensors within the panel, which are set - using the GConf system.</para> + using the MateConf system.</para> <variablelist> <varlistentry> <term><guilabel>Font Size</guilabel></term> <listitem> <para>The font size for labels and values is normally - derived from the standard Application Font size of the GNOME + derived from the standard Application Font size of the MATE Desktop, however this can be overridden. This is done by setting the value of the parameter <emphasis>/apps/sensors-applet/font-size</emphasis> - within the user's GConf database. This can be achieved by + within the user's MateConf database. This can be achieved by the following command, where the font size is specified as the last parameter, and in this case is set to <emphasis>10</emphasis>: <!-- CAN"T HAVE ANY LINE BREAKS IN COMMAND --> - <screen><userinput><command>gconftool-2 -s /apps/sensors-applet/font-size -t int 10</command></userinput></screen> + <screen><userinput><command>mateconftool-2 -s /apps/sensors-applet/font-size -t int 10</command></userinput></screen> </para> <note> @@ -651,21 +651,21 @@ Alarms for individual sensors must also be enabled. <emphasis>/apps/sensors-applet/hide-units</emphasis> - within the user's GConf database. This can be achieved by + within the user's MateConf database. This can be achieved by the following command, where the value is specified as either <emphasis>true</emphasis> or <emphasis>false</emphasis> and is specified as the last parameter. In this case is the units will be hidden (the value is set to <emphasis>true</emphasis>): <!-- CAN"T HAVE ANY LINE BREAKS IN COMMAND --> - <screen><userinput><command>gconftool-2 -s /apps/sensors-applet/hide-units -t bool true</command></userinput></screen> + <screen><userinput><command>mateconftool-2 -s /apps/sensors-applet/hide-units -t bool true</command></userinput></screen> </para> </listitem> </varlistentry> </variablelist> <note> <para>These values can also be set using the <ulink type="help" - url="ghelp:gconf-editor">Configuration Editor</ulink> + url="ghelp:mateconf-editor">Configuration Editor</ulink> application. </para> </note> @@ -725,9 +725,9 @@ Alarms for individual sensors must also be enabled. </article> <!-- OVERRIDE DICTIONARY SETTING SO THAT USE AMERICAN ENGLISH STYLE - --> -<!-- FROM GNOME HIG --> +<!-- FROM MATE HIG --> <!-- Local IspellDict: english --> <!-- LocalWords: hddtemp filesystem proc lm README Inspiron windtunnel --> <!-- LocalWords: ibm ACPI sysfs PowerPC adt Omnibook NVIDIA --> -<!-- LocalWords: libNVCtrl libsensors nvidia esdplay aplay ALSA zenity --> -<!-- LocalWords: acpi iMac Windfarm nvidia gconftool GConf bool --> +<!-- LocalWords: libNVCtrl libsensors nvidia esdplay aplay ALSA matedialog --> +<!-- LocalWords: acpi iMac Windfarm nvidia mateconftool MateConf bool --> diff --git a/help/ChangeLog b/help/ChangeLog index ab0d82d..e480ec2 100644 --- a/help/ChangeLog +++ b/help/ChangeLog @@ -1,4 +1,4 @@ 2005-11-08 Alex Murray <[email protected]> - * Switched to gnome-doc-utils + * Switched to mate-doc-utils diff --git a/help/Makefile.am b/help/Makefile.am index 11be928..54fb549 100644 --- a/help/Makefile.am +++ b/help/Makefile.am @@ -1,4 +1,4 @@ -include $(top_srcdir)/gnome-doc-utils.make +include $(top_srcdir)/mate-doc-utils.make dist-hook: doc-dist-hook DOC_MODULE = sensors-applet diff --git a/help/Makefile.in b/help/Makefile.in index 7002464..57c1579 100644 --- a/help/Makefile.in +++ b/help/Makefile.in @@ -15,8 +15,8 @@ @SET_MAKE@ -# gnome-doc-utils.make - make magic for building documentation -# Copyright (C) 2004-2005 Shaun McCance <[email protected]> +# mate-doc-utils.make - make magic for building documentation +# Copyright (C) 2004-2005 Shaun McCance <[email protected]> # # 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 @@ -58,7 +58,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/gnome-doc-utils.make ChangeLog + $(top_srcdir)/mate-doc-utils.make ChangeLog subdir = help ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -110,8 +110,8 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ +MATE_CFLAGS = @MATE_CFLAGS@ +MATE_LIBS = @MATE_LIBS@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ @@ -131,8 +131,8 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBATASMART_CFLAGS = @LIBATASMART_CFLAGS@ LIBATASMART_LIBS = @LIBATASMART_LIBS@ -LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ -LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ +LIBMATENOTIFY_CFLAGS = @LIBMATENOTIFY_CFLAGS@ +LIBMATENOTIFY_LIBS = @LIBMATENOTIFY_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBSENSORS_CFLAGS = @LIBSENSORS_CFLAGS@ @@ -351,7 +351,7 @@ DOC_LINGUAS = all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/gnome-doc-utils.make $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/mate-doc-utils.make $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -573,8 +573,8 @@ $(DOC_H_FILE): $(DOC_H_DOCS); cp [email protected] $@ && rm -f [email protected] dist-check-gdu: -@HAVE_GNOME_DOC_UTILS_FALSE@ @echo "*** GNOME Doc Utils must be installed in order to make dist" -@HAVE_GNOME_DOC_UTILS_FALSE@ @false +@HAVE_MATE_DOC_UTILS_FALSE@ @echo "*** MATE Doc Utils must be installed in order to make dist" +@HAVE_MATE_DOC_UTILS_FALSE@ @false .PHONY: dist-doc-header dist-doc-header: $(DOC_H_FILE) @@ -616,12 +616,12 @@ DOC_LINGUAS ?= _xml2po ?= `which xml2po` -_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils` -_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` -_malrng ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils` -_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl -_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl -_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl +_db2html ?= `$(PKG_CONFIG) --variable db2html mate-doc-utils` +_db2omf ?= `$(PKG_CONFIG) --variable db2omf mate-doc-utils` +_malrng ?= `$(PKG_CONFIG) --variable malrng mate-doc-utils` +_chunks ?= `$(PKG_CONFIG) --variable xmldir mate-doc-utils`/mate/xslt/docbook/utils/chunks.xsl +_credits ?= `$(PKG_CONFIG) --variable xmldir mate-doc-utils`/mate/xslt/docbook/utils/credits.xsl +_ids ?= `$(PKG_CONFIG) --variable xmldir mate-doc-utils`/mate/xslt/docbook/utils/ids.xsl @ENABLE_SK_TRUE@_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir` @ENABLE_SK_TRUE@_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir` @ENABLE_SK_TRUE@_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml diff --git a/lib/Makefile.am b/lib/Makefile.am index 83f3ea0..cc83f96 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,5 +1,5 @@ ## Process this file with automake to produce Makefile.in -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff --git a/lib/Makefile.in b/lib/Makefile.in index daf6cc7..de17c5c 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -132,8 +132,8 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ +MATE_CFLAGS = @MATE_CFLAGS@ +MATE_LIBS = @MATE_LIBS@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ @@ -153,8 +153,8 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBATASMART_CFLAGS = @LIBATASMART_CFLAGS@ LIBATASMART_LIBS = @LIBATASMART_LIBS@ -LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ -LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ +LIBMATENOTIFY_CFLAGS = @LIBMATENOTIFY_CFLAGS@ +LIBMATENOTIFY_LIBS = @LIBMATENOTIFY_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = $(GLIB_LIBS) LIBSENSORS_CFLAGS = @LIBSENSORS_CFLAGS@ @@ -255,7 +255,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff --git a/mate-doc-utils.make b/mate-doc-utils.make new file mode 100644 index 0000000..146981e --- /dev/null +++ b/mate-doc-utils.make @@ -0,0 +1,655 @@ +# mate-doc-utils.make - make magic for building documentation +# Copyright (C) 2004-2005 Shaun McCance <[email protected]> +# +# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +################################################################################ +## @@ Generating Header Files + +## @ DOC_H_FILE +## The name of the header file to generate +DOC_H_FILE ?= + +## @ DOC_H_DOCS +## The input DocBook files for generating the header file +DOC_H_DOCS ?= + +$(DOC_H_FILE): $(DOC_H_DOCS); + @rm -f [email protected]; touch [email protected]; + echo 'const gchar* documentation_credits[] = {' >> [email protected] + list='$(DOC_H_DOCS)'; for doc in $$list; do \ + xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \ + if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \ + xsltproc --path "$$xmlpath" $(_credits) $$doc; \ + done | sort | uniq \ + | awk 'BEGIN{s=""}{n=split($$0,w,"<");if(s!=""&&s!=substr(w[1],1,length(w[1])-1)){print s};if(n>1){print $$0;s=""}else{s=$$0}};END{if(s!=""){print s}}' \ + | sed -e 's/\\/\\\\/' -e 's/"/\\"/' -e 's/\(.*\)/\t"\1",/' >> [email protected] + echo ' NULL' >> [email protected] + echo '};' >> [email protected] + echo >> [email protected] + list='$(DOC_H_DOCS)'; for doc in $$list; do \ + xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \ + if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \ + docid=`echo "$$doc" | sed -e 's/.*\/\([^/]*\)\.xml/\1/' \ + | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`; \ + echo $$xmlpath; \ + ids=`xsltproc --xinclude --path "$$xmlpath" $(_ids) $$doc`; \ + for id in $$ids; do \ + echo '#define HELP_'`echo $$docid`'_'`echo $$id \ + | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`' "'$$id'"' >> [email protected]; \ + done; \ + echo >> [email protected]; \ + done; + cp [email protected] $@ && rm -f [email protected] + +dist-check-gdu: +if !HAVE_MATE_DOC_UTILS + @echo "*** MATE Doc Utils must be installed in order to make dist" + @false +endif + +.PHONY: dist-doc-header +dist-doc-header: $(DOC_H_FILE) + @if test -f "$(DOC_H_FILE)"; then d=; else d="$(srcdir)/"; fi; \ + echo "$(INSTALL_DATA) $${d}$(DOC_H_FILE) $(distdir)/$(DOC_H_FILE)"; \ + $(INSTALL_DATA) "$${d}$(DOC_H_FILE)" "$(distdir)/$(DOC_H_FILE)"; + +doc-dist-hook: dist-check-gdu $(if $(DOC_H_FILE),dist-doc-header) + +.PHONY: clean-doc-header +_clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header) +clean-local: $(_clean_doc_header) +distclean-local: $(_clean_doc_header) +mostlyclean-local: $(_clean_doc_header) +maintainer-clean-local: $(_clean_doc_header) +clean-doc-header: + rm -f $(DOC_H_FILE) + +all: $(DOC_H_FILE) + + +################################################################################ +## @@ Generating Documentation Files + +## @ DOC_MODULE +## The name of the document being built +DOC_MODULE ?= + +## @ DOC_ID +## The unique identifier for a Mallard document +DOC_ID ?= + +## @ DOC_PAGES +## Page files in a Mallard document +DOC_PAGES ?= + +## @ DOC_ENTITIES +## Files included with a SYSTEM entity +DOC_ENTITIES ?= + +## @ DOC_INCLUDES +## Files included with XInclude +DOC_INCLUDES ?= + +## @ DOC_FIGURES +## Figures and other external data +DOC_FIGURES ?= + +## @ DOC_FORMATS +## The default formats to be built and installed +DOC_FORMATS ?= docbook +_DOC_REAL_FORMATS = $(if $(DOC_USER_FORMATS),$(DOC_USER_FORMATS),$(DOC_FORMATS)) + +## @ DOC_LINGUAS +## The languages this document is translated into +DOC_LINGUAS ?= +_DOC_REAL_LINGUAS = $(if $(filter environment,$(origin LINGUAS)), \ + $(filter $(LINGUAS),$(DOC_LINGUAS)), \ + $(DOC_LINGUAS)) + +_DOC_ABS_SRCDIR = @abs_srcdir@ + + +################################################################################ +## Variables for Bootstrapping + +_xml2po ?= `which xml2po` +_xml2po_mode = $(if $(DOC_ID),mallard,docbook) + +_db2html ?= `$(PKG_CONFIG) --variable db2html mate-doc-utils` +_db2omf ?= `$(PKG_CONFIG) --variable db2omf mate-doc-utils` +_malrng ?= `$(PKG_CONFIG) --variable malrng mate-doc-utils` +_chunks ?= `$(PKG_CONFIG) --variable xmldir mate-doc-utils`/mate/xslt/docbook/utils/chunks.xsl +_credits ?= `$(PKG_CONFIG) --variable xmldir mate-doc-utils`/mate/xslt/docbook/utils/credits.xsl +_ids ?= `$(PKG_CONFIG) --variable xmldir mate-doc-utils`/mate/xslt/docbook/utils/ids.xsl + +if ENABLE_SK +_ENABLE_SK = true +_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir` +_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir` +_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml +endif + + +################################################################################ +## @@ Rules for OMF Files + +db2omf_args = \ + --stringparam db2omf.basename $(DOC_MODULE) \ + --stringparam db2omf.format $(3) \ + --stringparam db2omf.dtd \ + $(shell xmllint --format $(2) | grep -h PUBLIC | head -n 1 \ + | sed -e 's/.*PUBLIC \(\"[^\"]*\"\).*/\1/') \ + --stringparam db2omf.lang $(notdir $(patsubst %/$(notdir $(2)),%,$(2))) \ + --stringparam db2omf.omf_dir "$(OMF_DIR)" \ + --stringparam db2omf.help_dir "$(HELP_DIR)" \ + --stringparam db2omf.omf_in "$(_DOC_OMF_IN)" \ + $(if $(_ENABLE_SK), \ + --stringparam db2omf.scrollkeeper_cl "$(_skcontentslist)") \ + $(_db2omf) $(2) + +## @ _DOC_OMF_IN +## The OMF input file +_DOC_OMF_IN = $(if $(DOC_MODULE),$(wildcard $(_DOC_ABS_SRCDIR)/$(DOC_MODULE).omf.in)) + +## @ _DOC_OMF_DB +## The OMF files for DocBook output +_DOC_OMF_DB = $(if $(_DOC_OMF_IN), \ + $(foreach lc,C $(_DOC_REAL_LINGUAS),$(DOC_MODULE)-$(lc).omf)) + +$(_DOC_OMF_DB) : $(_DOC_OMF_IN) +$(_DOC_OMF_DB) : $(DOC_MODULE)-%.omf : %/$(DOC_MODULE).xml + @test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || { \ + echo "The file '$(_skcontentslist)' does not exist." >&2; \ + echo "Please check your ScrollKeeper installation." >&2; \ + exit 1; } + xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } + +## @ _DOC_OMF_HTML +## The OMF files for HTML output +_DOC_OMF_HTML = $(if $(_DOC_OMF_IN), \ + $(foreach lc,C $(_DOC_REAL_LINGUAS),$(DOC_MODULE)-html-$(lc).omf)) + +$(_DOC_OMF_HTML) : $(_DOC_OMF_IN) +$(_DOC_OMF_HTML) : $(DOC_MODULE)-html-%.omf : %/$(DOC_MODULE).xml +if ENABLE_SK + @test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || { \ + echo "The file '$(_skcontentslist)' does not exist" >&2; \ + echo "Please check your ScrollKeeper installation." >&2; \ + exit 1; } +endif + xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } + +## @ _DOC_OMF_ALL +## All OMF output files to be built +# FIXME +_DOC_OMF_ALL = \ + $(if $(filter docbook,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_DB)) \ + $(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_HTML)) + +.PHONY: omf +omf: $(_DOC_OMF_ALL) + + +################################################################################ +## @@ C Locale Documents + +## @ _DOC_C_MODULE +## The top-level documentation file in the C locale +_DOC_C_MODULE = $(if $(DOC_MODULE),C/$(DOC_MODULE).xml) + +## @ _DOC_C_PAGES +## Page files in a Mallard document in the C locale +_DOC_C_PAGES = $(foreach page,$(DOC_PAGES),C/$(page)) + +## @ _DOC_C_ENTITIES +## Files included with a SYSTEM entity in the C locale +_DOC_C_ENTITIES = $(foreach ent,$(DOC_ENTITIES),C/$(ent)) + +## @ _DOC_C_XINCLUDES +## Files included with XInclude in the C locale +_DOC_C_INCLUDES = $(foreach inc,$(DOC_INCLUDES),C/$(inc)) + +## @ _DOC_C_DOCS +## All documentation files in the C locale +_DOC_C_DOCS = \ + $(_DOC_C_ENTITIES) $(_DOC_C_INCLUDES) \ + $(_DOC_C_PAGES) $(_DOC_C_MODULE) + +## @ _DOC_C_DOCS_NOENT +## All documentation files in the C locale, +## except files included with a SYSTEM entity +_DOC_C_DOCS_NOENT = \ + $(_DOC_C_MODULE) $(_DOC_C_INCLUDES) \ + $(_DOC_C_PAGES) + +## @ _DOC_C_FIGURES +## All figures and other external data in the C locale +_DOC_C_FIGURES = $(if $(DOC_FIGURES), \ + $(foreach fig,$(DOC_FIGURES),C/$(fig)), \ + $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/C/figures/*.png))) + +## @ _DOC_C_HTML +## All HTML documentation in the C locale +# FIXME: probably have to shell escape to determine the file names +_DOC_C_HTML = $(foreach f, \ + $(shell xsltproc --xinclude \ + --stringparam db.chunk.basename "$(DOC_MODULE)" \ + $(_chunks) "C/$(DOC_MODULE).xml"), \ + C/$(f).xhtml) + +############################################################################### +## @@ Other Locale Documentation + +## @ _DOC_POFILES +## The .po files used for translating the document +_DOC_POFILES = $(if $(DOC_MODULE)$(DOC_ID), \ + $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(lc).po)) + +.PHONY: po +po: $(_DOC_POFILES) + +## @ _DOC_MOFILES +## The .mo files used for translating the document +_DOC_MOFILES = $(patsubst %.po,%.mo,$(_DOC_POFILES)) + +.PHONY: mo +mo: $(_DOC_MOFILES) + +## @ _DOC_LC_MODULES +## The top-level documentation files in all other locales +_DOC_LC_MODULES = $(if $(DOC_MODULE), \ + $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xml)) + +## @ _DOC_LC_PAGES +## Page files in a Mallard document in all other locales +_DOC_LC_PAGES = \ + $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach page,$(_DOC_C_PAGES), \ + $(lc)/$(notdir $(page)) )) + +## @ _DOC_LC_XINCLUDES +## Files included with XInclude in all other locales +_DOC_LC_INCLUDES = \ + $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach inc,$(_DOC_C_INCLUDES), \ + $(lc)/$(notdir $(inc)) )) + +## @ _DOC_LC_HTML +## All HTML documentation in all other locales +# FIXME: probably have to shell escape to determine the file names +_DOC_LC_HTML = \ + $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach doc,$(_DOC_C_HTML), \ + $(lc)/$(notdir $(doc)) )) + +## @ _DOC_LC_DOCS +## All documentation files in all other locales +_DOC_LC_DOCS = \ + $(_DOC_LC_MODULES) $(_DOC_LC_INCLUDES) $(_DOC_LC_PAGES) \ + $(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML)) + +## @ _DOC_LC_FIGURES +## All figures and other external data in all other locales +_DOC_LC_FIGURES = $(foreach lc,$(_DOC_REAL_LINGUAS), \ + $(patsubst C/%,$(lc)/%,$(_DOC_C_FIGURES)) ) + +_DOC_SRC_FIGURES = \ + $(foreach fig,$(_DOC_C_FIGURES), $(foreach lc,C $(_DOC_REAL_LINGUAS), \ + $(wildcard $(srcdir)/$(lc)/$(patsubst C/%,%,$(fig))) )) + +$(_DOC_POFILES): + @if ! test -d $(dir $@); then \ + echo "mkdir $(dir $@)"; \ + mkdir "$(dir $@)"; \ + fi + @if test ! -f $@ -a -f $(srcdir)/$@; then \ + echo "cp $(srcdir)/$@ $@"; \ + cp "$(srcdir)/$@" "$@"; \ + fi; + @docs=; \ + list='$(_DOC_C_DOCS_NOENT)'; for doc in $$list; do \ + docs="$$docs $(_DOC_ABS_SRCDIR)/$$doc"; \ + done; \ + if ! test -f $@; then \ + echo "(cd $(dir $@) && \ + $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \ + cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)"; \ + (cd $(dir $@) && \ + $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \ + cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp); \ + else \ + echo "(cd $(dir $@) && \ + $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs)"; \ + (cd $(dir $@) && \ + $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \ + fi + +$(_DOC_MOFILES): %.mo: %.po + @if ! test -d $(dir $@); then \ + echo "mkdir $(dir $@)"; \ + mkdir "$(dir $@)"; \ + fi + msgfmt -o $@ $< + +# FIXME: fix the dependancy +# FIXME: hook xml2po up +$(_DOC_LC_DOCS) : $(_DOC_MOFILES) +$(_DOC_LC_DOCS) : $(_DOC_C_DOCS) + if ! test -d $(dir $@); then mkdir $(dir $@); fi + if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ + mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \ + if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \ + (cd $(dir $@) && \ + $(_xml2po) -m $(_xml2po_mode) -e -t "$${mo}" \ + "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \ + cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp) + +## @ _DOC_POT +## A pot file +_DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot) +.PHONY: pot +pot: $(_DOC_POT) +$(_DOC_POT): $(_DOC_C_DOCS_NOENT) + $(_xml2po) -m $(_xml2po_mode) -e -o $@ $^ + + +################################################################################ +## @@ All Documentation + +## @ _DOC_HTML_ALL +## All HTML documentation, only if it's built +_DOC_HTML_ALL = $(if $(filter html HTML,$(_DOC_REAL_FORMATS)), \ + $(_DOC_C_HTML) $(_DOC_LC_HTML)) + +_DOC_HTML_TOPS = $(foreach lc,C $(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xhtml) + +$(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS) + xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) + + +################################################################################ +## All + +all: \ + $(_DOC_C_DOCS) $(_DOC_LC_DOCS) \ + $(_DOC_OMF_ALL) $(_DOC_DSK_ALL) \ + $(_DOC_HTML_ALL) $(_DOC_POFILES) + + +################################################################################ +## Clean + +.PHONY: clean-doc-omf clean-doc-dsk clean-doc-lc clean-doc-dir + +clean-doc-omf: ; rm -f $(_DOC_OMF_DB) $(_DOC_OMF_HTML) +clean-doc-dsk: ; rm -f $(_DOC_DSK_DB) $(_DOC_DSK_HTML) +clean-doc-lc: + rm -f $(_DOC_LC_DOCS) + rm -f $(_DOC_MOFILES) + @list='$(_DOC_POFILES)'; for po in $$list; do \ + if ! test "$$po" -ef "$(srcdir)/$$po"; then \ + echo "rm -f $$po"; \ + rm -f "$$po"; \ + fi; \ + done +# .xml2.po.mo cleaning is obsolete as of 0.18.1 and could be removed in 0.20.x + @for lc in C $(_DOC_REAL_LINGUAS); do \ + if test -f "$$lc/.xml2po.mo"; then \ + echo "rm -f $$lc/.xml2po.mo"; \ + rm -f "$$lc/.xml2po.mo"; \ + fi; \ + done +clean-doc-dir: clean-doc-lc + @for lc in C $(_DOC_REAL_LINGUAS); do \ + for dir in `find $$lc -depth -type d`; do \ + if ! test $$dir -ef $(srcdir)/$$dir; then \ + echo "rmdir $$dir"; \ + rmdir "$$dir"; \ + fi; \ + done; \ + done + +_clean_omf = $(if $(_DOC_OMF_IN),clean-doc-omf) +_clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk) +_clean_lc = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc) +_clean_dir = $(if $(DOC_MODULE)$(DOC_ID),clean-doc-dir) + +clean-local: \ + $(_clean_omf) $(_clean_dsk) \ + $(_clean_lc) $(_clean_dir) +distclean-local: \ + $(_clean_omf) $(_clean_dsk) \ + $(_clean_lc) $(_clean_dir) +mostlyclean-local: \ + $(_clean_omf) $(_clean_dsk) \ + $(_clean_lc) $(_clean_dir) +maintainer-clean-local: \ + $(_clean_omf) $(_clean_dsk) \ + $(_clean_lc) $(_clean_dir) + + + +################################################################################ +## Dist + +.PHONY: dist-doc-docs dist-doc-pages dist-doc-figs dist-doc-omf dist-doc-dsk +doc-dist-hook: \ + $(if $(DOC_MODULE)$(DOC_ID),dist-doc-docs) \ + $(if $(_DOC_C_FIGURES),dist-doc-figs) \ + $(if $(_DOC_OMF_IN),dist-doc-omf) +# $(if $(_DOC_DSK_IN),dist-doc-dsk) + +dist-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES) + @for lc in C $(_DOC_REAL_LINGUAS); do \ + echo " $(mkinstalldirs) $(distdir)/$$lc"; \ + $(mkinstalldirs) "$(distdir)/$$lc"; \ + done + @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \ + for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + if ! test -d "$(distdir)/$$docdir"; then \ + echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ + $(mkinstalldirs) "$(distdir)/$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ + $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ + done + +dist-doc-figs: $(_DOC_SRC_FIGURES) + @list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; \ + for fig in $$list; do \ + if test -f "$$fig"; then d=; else d="$(srcdir)/"; fi; \ + if test -f "$$d$$fig"; then \ + figdir=`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + if ! test -d "$(distdir)/$$figdir"; then \ + echo "$(mkinstalldirs) $(distdir)/$$figdir"; \ + $(mkinstalldirs) "$(distdir)/$$figdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$fig $(distdir)/$$fig"; \ + $(INSTALL_DATA) "$$d$$fig" "$(distdir)/$$fig"; \ + fi; \ + done; + +dist-doc-omf: + @if test -f "$(_DOC_OMF_IN)"; then d=; else d="$(srcdir)/"; fi; \ + echo "$(INSTALL_DATA) $$d$(_DOC_OMF_IN) $(distdir)/$(notdir $(_DOC_OMF_IN))"; \ + $(INSTALL_DATA) "$$d$(_DOC_OMF_IN)" "$(distdir)/$(notdir $(_DOC_OMF_IN))" + +dist-doc-dsk: + @if test -f "$(_DOC_DSK_IN)"; then d=; else d="$(srcdir)/"; fi; \ + echo "$(INSTALL_DATA) $$d$(_DOC_DSK_IN) $(distdir)/$(notdir $(_DOC_DSK_IN))"; \ + $(INSTALL_DATA) "$$d$(_DOC_DSK_IN)" "$(distdir)/$(notdir $(_DOC_DSK_IN))" + + + +################################################################################ +## Check + +.PHONY: check-doc-docs check-doc-omf +check: \ + $(if $(DOC_MODULE),check-doc-docs) \ + $(if $(DOC_ID),check-doc-pages) \ + $(if $(_DOC_OMF_IN),check-doc-omf) + +check-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS) + @for lc in C $(_DOC_REAL_LINGUAS); do \ + if test -f "$$lc"; \ + then d=; \ + xmlpath="$$lc"; \ + else \ + d="$(srcdir)/"; \ + xmlpath="$$lc:$(srcdir)/$$lc"; \ + fi; \ + echo "xmllint --noout --noent --path $$xmlpath --xinclude --postvalid $$d$$lc/$(DOC_MODULE).xml"; \ + xmllint --noout --noent --path "$$xmlpath" --xinclude --postvalid "$$d$$lc/$(DOC_MODULE).xml"; \ + done + +check-doc-pages: $(_DOC_C_PAGES) $(_DOC_LC_PAGES) + for lc in C $(_DOC_REAL_LINGUAS); do \ + if test -f "$$lc"; \ + then d=; \ + xmlpath="$$lc"; \ + else \ + d="$(srcdir)/"; \ + xmlpath="$$lc:$(srcdir)/$$lc"; \ + fi; \ + for page in $(DOC_PAGES); do \ + echo "xmllint --noout --noent --path $$xmlpath --xinclude --relaxng $(_malrng) $$d$$lc/$$page"; \ + xmllint --noout --noent --path "$$xmlpath" --xinclude --relaxng "$(_malrng)" "$$d$$lc/$$page"; \ + done; \ + done + +check-doc-omf: $(_DOC_OMF_ALL) + @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \ + echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \ + xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \ + done + + + +################################################################################ +## Install + +.PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk + +_doc_install_dir = $(if $(DOC_ID),$(DOC_ID),$(DOC_MODULE)) + +install-data-local: \ + $(if $(DOC_MODULE)$(DOC_ID),install-doc-docs) \ + $(if $(_DOC_HTML_ALL),install-doc-html) \ + $(if $(_DOC_C_FIGURES),install-doc-figs) \ + $(if $(_DOC_OMF_IN),install-doc-omf) +# $(if $(_DOC_DSK_IN),install-doc-dsk) + +install-doc-docs: + @for lc in C $(_DOC_REAL_LINGUAS); do \ + echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc"; \ + $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc; \ + done + @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \ + if ! test -d "$$docdir"; then \ + echo "$(mkinstalldirs) $$docdir"; \ + $(mkinstalldirs) "$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \ + done + +install-doc-figs: + @list='$(patsubst C/%,%,$(_DOC_C_FIGURES))'; for fig in $$list; do \ + for lc in C $(_DOC_REAL_LINGUAS); do \ + figsymlink=false; \ + if test -f "$$lc/$$fig"; then \ + figfile="$$lc/$$fig"; \ + elif test -f "$(srcdir)/$$lc/$$fig"; then \ + figfile="$(srcdir)/$$lc/$$fig"; \ + else \ + figsymlink=true; \ + fi; \ + figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + figdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$figdir"; \ + if ! test -d "$$figdir"; then \ + echo "$(mkinstalldirs) $$figdir"; \ + $(mkinstalldirs) "$$figdir"; \ + fi; \ + figbase=`echo $$fig | sed -e 's/^.*\///'`; \ + if $$figsymlink; then \ + echo "cd $$figdir && $(LN_S) -f ../../C/$$fig $$figbase"; \ + ( cd "$$figdir" && $(LN_S) -f "../../C/$$fig" "$$figbase" ); \ + else \ + echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \ + $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \ + fi; \ + done; \ + done + +install-doc-html: + echo install-html + +install-doc-omf: + $(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir) + @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \ + echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \ + $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf; \ + done + @if test "x$(_ENABLE_SK)" = "xtrue"; then \ + echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \ + scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \ + fi; + +install-doc-dsk: + echo install-dsk + + + +################################################################################ +## Uninstall + +.PHONY: uninstall-doc-docs uninstall-doc-html uninstall-doc-figs uninstall-doc-omf uninstall-doc-dsk +uninstall-local: \ + $(if $(DOC_MODULE)$(DOC_ID),uninstall-doc-docs) \ + $(if $(_DOC_HTML_ALL),uninstall-doc-html) \ + $(if $(_DOC_C_FIGURES),uninstall-doc-figs) \ + $(if $(_DOC_OMF_IN),uninstall-doc-omf) +# $(if $(_DOC_DSK_IN),uninstall-doc-dsk) + +uninstall-doc-docs: + @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ + echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + done + +uninstall-doc-figs: + @list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; for fig in $$list; do \ + echo "rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \ + rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \ + done; + +uninstall-doc-omf: + @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \ + if test "x$(_ENABLE_SK)" = "xtrue"; then \ + echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \ + scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \ + fi; \ + echo "rm -f $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \ + rm -f "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \ + done diff --git a/pixmaps/Makefile.in b/pixmaps/Makefile.in index 0a329d7..9631ba5 100644 --- a/pixmaps/Makefile.in +++ b/pixmaps/Makefile.in @@ -110,8 +110,8 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ +MATE_CFLAGS = @MATE_CFLAGS@ +MATE_LIBS = @MATE_LIBS@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ @@ -131,8 +131,8 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBATASMART_CFLAGS = @LIBATASMART_CFLAGS@ LIBATASMART_LIBS = @LIBATASMART_LIBS@ -LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ -LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ +LIBMATENOTIFY_CFLAGS = @LIBMATENOTIFY_CFLAGS@ +LIBMATENOTIFY_LIBS = @LIBMATENOTIFY_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBSENSORS_CFLAGS = @LIBSENSORS_CFLAGS@ diff --git a/pixmaps/sensors-applet.png b/pixmaps/sensors-applet.png Binary files differindex 908dce9..a4bcd4e 100644 --- a/pixmaps/sensors-applet.png +++ b/pixmaps/sensors-applet.png diff --git a/plugins/Makefile.in b/plugins/Makefile.in index 7fbee5e..c754515 100644 --- a/plugins/Makefile.in +++ b/plugins/Makefile.in @@ -129,8 +129,8 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ +MATE_CFLAGS = @MATE_CFLAGS@ +MATE_LIBS = @MATE_LIBS@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ @@ -150,8 +150,8 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBATASMART_CFLAGS = @LIBATASMART_CFLAGS@ LIBATASMART_LIBS = @LIBATASMART_LIBS@ -LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ -LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ +LIBMATENOTIFY_CFLAGS = @LIBMATENOTIFY_CFLAGS@ +LIBMATENOTIFY_LIBS = @LIBMATENOTIFY_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBSENSORS_CFLAGS = @LIBSENSORS_CFLAGS@ diff --git a/plugins/acpi/Makefile.am b/plugins/acpi/Makefile.am index 954214c..549e880 100644 --- a/plugins/acpi/Makefile.am +++ b/plugins/acpi/Makefile.am @@ -1,7 +1,7 @@ # ACPI plugin plugindir = $(libdir)/sensors-applet/plugins -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff --git a/plugins/acpi/Makefile.in b/plugins/acpi/Makefile.in index de43bb9..5887772 100644 --- a/plugins/acpi/Makefile.in +++ b/plugins/acpi/Makefile.in @@ -131,8 +131,8 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ +MATE_CFLAGS = @MATE_CFLAGS@ +MATE_LIBS = @MATE_LIBS@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ @@ -152,8 +152,8 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBATASMART_CFLAGS = @LIBATASMART_CFLAGS@ LIBATASMART_LIBS = @LIBATASMART_LIBS@ -LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ -LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ +LIBMATENOTIFY_CFLAGS = @LIBMATENOTIFY_CFLAGS@ +LIBMATENOTIFY_LIBS = @LIBMATENOTIFY_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBSENSORS_CFLAGS = @LIBSENSORS_CFLAGS@ @@ -257,7 +257,7 @@ top_srcdir = @top_srcdir@ # ACPI plugin plugindir = $(libdir)/sensors-applet/plugins -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff --git a/plugins/aticonfig/Makefile.am b/plugins/aticonfig/Makefile.am index 6d2c2c9..c9d736e 100644 --- a/plugins/aticonfig/Makefile.am +++ b/plugins/aticonfig/Makefile.am @@ -1,7 +1,7 @@ # ATICONFIG plugin plugindir = $(libdir)/sensors-applet/plugins -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff --git a/plugins/aticonfig/Makefile.in b/plugins/aticonfig/Makefile.in index be6478f..6dc1f0a 100644 --- a/plugins/aticonfig/Makefile.in +++ b/plugins/aticonfig/Makefile.in @@ -131,8 +131,8 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ +MATE_CFLAGS = @MATE_CFLAGS@ +MATE_LIBS = @MATE_LIBS@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ @@ -152,8 +152,8 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBATASMART_CFLAGS = @LIBATASMART_CFLAGS@ LIBATASMART_LIBS = @LIBATASMART_LIBS@ -LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ -LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ +LIBMATENOTIFY_CFLAGS = @LIBMATENOTIFY_CFLAGS@ +LIBMATENOTIFY_LIBS = @LIBMATENOTIFY_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBSENSORS_CFLAGS = @LIBSENSORS_CFLAGS@ @@ -257,7 +257,7 @@ top_srcdir = @top_srcdir@ # ATICONFIG plugin plugindir = $(libdir)/sensors-applet/plugins -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff --git a/plugins/eee/Makefile.am b/plugins/eee/Makefile.am index 0187c91..32cc8e8 100644 --- a/plugins/eee/Makefile.am +++ b/plugins/eee/Makefile.am @@ -1,7 +1,7 @@ # ACPI plugin plugindir = $(libdir)/sensors-applet/plugins -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff --git a/plugins/eee/Makefile.in b/plugins/eee/Makefile.in index b30b004..cd59e8a 100644 --- a/plugins/eee/Makefile.in +++ b/plugins/eee/Makefile.in @@ -131,8 +131,8 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ +MATE_CFLAGS = @MATE_CFLAGS@ +MATE_LIBS = @MATE_LIBS@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ @@ -152,8 +152,8 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBATASMART_CFLAGS = @LIBATASMART_CFLAGS@ LIBATASMART_LIBS = @LIBATASMART_LIBS@ -LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ -LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ +LIBMATENOTIFY_CFLAGS = @LIBMATENOTIFY_CFLAGS@ +LIBMATENOTIFY_LIBS = @LIBMATENOTIFY_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBSENSORS_CFLAGS = @LIBSENSORS_CFLAGS@ @@ -257,7 +257,7 @@ top_srcdir = @top_srcdir@ # ACPI plugin plugindir = $(libdir)/sensors-applet/plugins -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff --git a/plugins/hddtemp/Makefile.am b/plugins/hddtemp/Makefile.am index da45fa2..579effe 100644 --- a/plugins/hddtemp/Makefile.am +++ b/plugins/hddtemp/Makefile.am @@ -1,7 +1,7 @@ # HDDTEMP plugin plugindir = $(libdir)/sensors-applet/plugins -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff --git a/plugins/hddtemp/Makefile.in b/plugins/hddtemp/Makefile.in index 4f28726..4ebbd38 100644 --- a/plugins/hddtemp/Makefile.in +++ b/plugins/hddtemp/Makefile.in @@ -131,8 +131,8 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ +MATE_CFLAGS = @MATE_CFLAGS@ +MATE_LIBS = @MATE_LIBS@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ @@ -152,8 +152,8 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBATASMART_CFLAGS = @LIBATASMART_CFLAGS@ LIBATASMART_LIBS = @LIBATASMART_LIBS@ -LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ -LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ +LIBMATENOTIFY_CFLAGS = @LIBMATENOTIFY_CFLAGS@ +LIBMATENOTIFY_LIBS = @LIBMATENOTIFY_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBSENSORS_CFLAGS = @LIBSENSORS_CFLAGS@ @@ -257,7 +257,7 @@ top_srcdir = @top_srcdir@ # HDDTEMP plugin plugindir = $(libdir)/sensors-applet/plugins -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff --git a/plugins/i2c-proc/Makefile.am b/plugins/i2c-proc/Makefile.am index 8f7808c..b19b2e6 100644 --- a/plugins/i2c-proc/Makefile.am +++ b/plugins/i2c-proc/Makefile.am @@ -1,7 +1,7 @@ # I2C-PROC plugin plugindir = $(libdir)/sensors-applet/plugins -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff --git a/plugins/i2c-proc/Makefile.in b/plugins/i2c-proc/Makefile.in index df64d9c..94bbdaa 100644 --- a/plugins/i2c-proc/Makefile.in +++ b/plugins/i2c-proc/Makefile.in @@ -131,8 +131,8 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ +MATE_CFLAGS = @MATE_CFLAGS@ +MATE_LIBS = @MATE_LIBS@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ @@ -152,8 +152,8 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBATASMART_CFLAGS = @LIBATASMART_CFLAGS@ LIBATASMART_LIBS = @LIBATASMART_LIBS@ -LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ -LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ +LIBMATENOTIFY_CFLAGS = @LIBMATENOTIFY_CFLAGS@ +LIBMATENOTIFY_LIBS = @LIBMATENOTIFY_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBSENSORS_CFLAGS = @LIBSENSORS_CFLAGS@ @@ -257,7 +257,7 @@ top_srcdir = @top_srcdir@ # I2C-PROC plugin plugindir = $(libdir)/sensors-applet/plugins -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff --git a/plugins/i2c-sys/Makefile.am b/plugins/i2c-sys/Makefile.am index 1647f16..3901644 100644 --- a/plugins/i2c-sys/Makefile.am +++ b/plugins/i2c-sys/Makefile.am @@ -1,7 +1,7 @@ # I2C-SYS plugin plugindir = $(libdir)/sensors-applet/plugins -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff --git a/plugins/i2c-sys/Makefile.in b/plugins/i2c-sys/Makefile.in index 2bcbd0f..f609513 100644 --- a/plugins/i2c-sys/Makefile.in +++ b/plugins/i2c-sys/Makefile.in @@ -131,8 +131,8 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ +MATE_CFLAGS = @MATE_CFLAGS@ +MATE_LIBS = @MATE_LIBS@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ @@ -152,8 +152,8 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBATASMART_CFLAGS = @LIBATASMART_CFLAGS@ LIBATASMART_LIBS = @LIBATASMART_LIBS@ -LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ -LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ +LIBMATENOTIFY_CFLAGS = @LIBMATENOTIFY_CFLAGS@ +LIBMATENOTIFY_LIBS = @LIBMATENOTIFY_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBSENSORS_CFLAGS = @LIBSENSORS_CFLAGS@ @@ -257,7 +257,7 @@ top_srcdir = @top_srcdir@ # I2C-SYS plugin plugindir = $(libdir)/sensors-applet/plugins -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff --git a/plugins/i8k/Makefile.am b/plugins/i8k/Makefile.am index 84044ec..3bf5beb 100644 --- a/plugins/i8k/Makefile.am +++ b/plugins/i8k/Makefile.am @@ -1,7 +1,7 @@ # I8K plugin plugindir = $(libdir)/sensors-applet/plugins -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff --git a/plugins/i8k/Makefile.in b/plugins/i8k/Makefile.in index 687dc31..781dd08 100644 --- a/plugins/i8k/Makefile.in +++ b/plugins/i8k/Makefile.in @@ -131,8 +131,8 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ +MATE_CFLAGS = @MATE_CFLAGS@ +MATE_LIBS = @MATE_LIBS@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ @@ -152,8 +152,8 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBATASMART_CFLAGS = @LIBATASMART_CFLAGS@ LIBATASMART_LIBS = @LIBATASMART_LIBS@ -LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ -LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ +LIBMATENOTIFY_CFLAGS = @LIBMATENOTIFY_CFLAGS@ +LIBMATENOTIFY_LIBS = @LIBMATENOTIFY_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBSENSORS_CFLAGS = @LIBSENSORS_CFLAGS@ @@ -257,7 +257,7 @@ top_srcdir = @top_srcdir@ # I8K plugin plugindir = $(libdir)/sensors-applet/plugins -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff --git a/plugins/ibm-acpi/Makefile.am b/plugins/ibm-acpi/Makefile.am index 0ed6ea4..49e9c73 100644 --- a/plugins/ibm-acpi/Makefile.am +++ b/plugins/ibm-acpi/Makefile.am @@ -1,7 +1,7 @@ # IBM-ACPI plugin plugindir = $(libdir)/sensors-applet/plugins -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff --git a/plugins/ibm-acpi/Makefile.in b/plugins/ibm-acpi/Makefile.in index ce109c4..184f25b 100644 --- a/plugins/ibm-acpi/Makefile.in +++ b/plugins/ibm-acpi/Makefile.in @@ -131,8 +131,8 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ +MATE_CFLAGS = @MATE_CFLAGS@ +MATE_LIBS = @MATE_LIBS@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ @@ -152,8 +152,8 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBATASMART_CFLAGS = @LIBATASMART_CFLAGS@ LIBATASMART_LIBS = @LIBATASMART_LIBS@ -LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ -LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ +LIBMATENOTIFY_CFLAGS = @LIBMATENOTIFY_CFLAGS@ +LIBMATENOTIFY_LIBS = @LIBMATENOTIFY_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBSENSORS_CFLAGS = @LIBSENSORS_CFLAGS@ @@ -257,7 +257,7 @@ top_srcdir = @top_srcdir@ # IBM-ACPI plugin plugindir = $(libdir)/sensors-applet/plugins -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff --git a/plugins/libsensors/Makefile.am b/plugins/libsensors/Makefile.am index 082257b..138872e 100644 --- a/plugins/libsensors/Makefile.am +++ b/plugins/libsensors/Makefile.am @@ -1,7 +1,7 @@ plugindir = $(libdir)/sensors-applet/plugins # libsensors plugin -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff --git a/plugins/libsensors/Makefile.in b/plugins/libsensors/Makefile.in index 70adb15..dbc77bc 100644 --- a/plugins/libsensors/Makefile.in +++ b/plugins/libsensors/Makefile.in @@ -131,8 +131,8 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ +MATE_CFLAGS = @MATE_CFLAGS@ +MATE_LIBS = @MATE_LIBS@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ @@ -152,8 +152,8 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBATASMART_CFLAGS = @LIBATASMART_CFLAGS@ LIBATASMART_LIBS = @LIBATASMART_LIBS@ -LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ -LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ +LIBMATENOTIFY_CFLAGS = @LIBMATENOTIFY_CFLAGS@ +LIBMATENOTIFY_LIBS = @LIBMATENOTIFY_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBSENSORS_CFLAGS = @LIBSENSORS_CFLAGS@ @@ -257,7 +257,7 @@ top_srcdir = @top_srcdir@ plugindir = $(libdir)/sensors-applet/plugins # libsensors plugin -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff --git a/plugins/nvidia/Makefile.am b/plugins/nvidia/Makefile.am index 88c85b7..72ced99 100644 --- a/plugins/nvidia/Makefile.am +++ b/plugins/nvidia/Makefile.am @@ -1,7 +1,7 @@ # NVIDIA plugin plugindir = $(libdir)/sensors-applet/plugins -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff --git a/plugins/nvidia/Makefile.in b/plugins/nvidia/Makefile.in index cbd5850..5c9803f 100644 --- a/plugins/nvidia/Makefile.in +++ b/plugins/nvidia/Makefile.in @@ -131,8 +131,8 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ +MATE_CFLAGS = @MATE_CFLAGS@ +MATE_LIBS = @MATE_LIBS@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ @@ -152,8 +152,8 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBATASMART_CFLAGS = @LIBATASMART_CFLAGS@ LIBATASMART_LIBS = @LIBATASMART_LIBS@ -LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ -LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ +LIBMATENOTIFY_CFLAGS = @LIBMATENOTIFY_CFLAGS@ +LIBMATENOTIFY_LIBS = @LIBMATENOTIFY_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBSENSORS_CFLAGS = @LIBSENSORS_CFLAGS@ @@ -257,7 +257,7 @@ top_srcdir = @top_srcdir@ # NVIDIA plugin plugindir = $(libdir)/sensors-applet/plugins -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff --git a/plugins/omnibook/Makefile.am b/plugins/omnibook/Makefile.am index 0633b4b..2cb3c06 100644 --- a/plugins/omnibook/Makefile.am +++ b/plugins/omnibook/Makefile.am @@ -1,7 +1,7 @@ # OMNIBOOK plugin plugindir = $(libdir)/sensors-applet/plugins -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff --git a/plugins/omnibook/Makefile.in b/plugins/omnibook/Makefile.in index 96d7c03..b73d7d5 100644 --- a/plugins/omnibook/Makefile.in +++ b/plugins/omnibook/Makefile.in @@ -131,8 +131,8 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ +MATE_CFLAGS = @MATE_CFLAGS@ +MATE_LIBS = @MATE_LIBS@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ @@ -152,8 +152,8 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBATASMART_CFLAGS = @LIBATASMART_CFLAGS@ LIBATASMART_LIBS = @LIBATASMART_LIBS@ -LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ -LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ +LIBMATENOTIFY_CFLAGS = @LIBMATENOTIFY_CFLAGS@ +LIBMATENOTIFY_LIBS = @LIBMATENOTIFY_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBSENSORS_CFLAGS = @LIBSENSORS_CFLAGS@ @@ -257,7 +257,7 @@ top_srcdir = @top_srcdir@ # OMNIBOOK plugin plugindir = $(libdir)/sensors-applet/plugins -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff --git a/plugins/pmu-sys/Makefile.am b/plugins/pmu-sys/Makefile.am index 4a70a1d..d8442fc 100644 --- a/plugins/pmu-sys/Makefile.am +++ b/plugins/pmu-sys/Makefile.am @@ -1,7 +1,7 @@ # PMU-SYS plugin plugindir = $(libdir)/sensors-applet/plugins -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff --git a/plugins/pmu-sys/Makefile.in b/plugins/pmu-sys/Makefile.in index e6ff36f..3998330 100644 --- a/plugins/pmu-sys/Makefile.in +++ b/plugins/pmu-sys/Makefile.in @@ -131,8 +131,8 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ +MATE_CFLAGS = @MATE_CFLAGS@ +MATE_LIBS = @MATE_LIBS@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ @@ -152,8 +152,8 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBATASMART_CFLAGS = @LIBATASMART_CFLAGS@ LIBATASMART_LIBS = @LIBATASMART_LIBS@ -LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ -LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ +LIBMATENOTIFY_CFLAGS = @LIBMATENOTIFY_CFLAGS@ +LIBMATENOTIFY_LIBS = @LIBMATENOTIFY_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBSENSORS_CFLAGS = @LIBSENSORS_CFLAGS@ @@ -257,7 +257,7 @@ top_srcdir = @top_srcdir@ # PMU-SYS plugin plugindir = $(libdir)/sensors-applet/plugins -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff --git a/plugins/smu-sys/Makefile.am b/plugins/smu-sys/Makefile.am index b7477ce..fb03275 100644 --- a/plugins/smu-sys/Makefile.am +++ b/plugins/smu-sys/Makefile.am @@ -1,7 +1,7 @@ # SMU-SYS plugin plugindir = $(libdir)/sensors-applet/plugins -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff --git a/plugins/smu-sys/Makefile.in b/plugins/smu-sys/Makefile.in index dc161a4..f8e600b 100644 --- a/plugins/smu-sys/Makefile.in +++ b/plugins/smu-sys/Makefile.in @@ -131,8 +131,8 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ +MATE_CFLAGS = @MATE_CFLAGS@ +MATE_LIBS = @MATE_LIBS@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ @@ -152,8 +152,8 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBATASMART_CFLAGS = @LIBATASMART_CFLAGS@ LIBATASMART_LIBS = @LIBATASMART_LIBS@ -LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ -LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ +LIBMATENOTIFY_CFLAGS = @LIBMATENOTIFY_CFLAGS@ +LIBMATENOTIFY_LIBS = @LIBMATENOTIFY_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBSENSORS_CFLAGS = @LIBSENSORS_CFLAGS@ @@ -257,7 +257,7 @@ top_srcdir = @top_srcdir@ # SMU-SYS plugin plugindir = $(libdir)/sensors-applet/plugins -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff --git a/plugins/sonypi/Makefile.am b/plugins/sonypi/Makefile.am index 5f2f708..b206cf7 100644 --- a/plugins/sonypi/Makefile.am +++ b/plugins/sonypi/Makefile.am @@ -1,7 +1,7 @@ # SONYPI plugin plugindir = $(libdir)/sensors-applet/plugins -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff --git a/plugins/sonypi/Makefile.in b/plugins/sonypi/Makefile.in index cc35f46..31a022e 100644 --- a/plugins/sonypi/Makefile.in +++ b/plugins/sonypi/Makefile.in @@ -131,8 +131,8 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ +MATE_CFLAGS = @MATE_CFLAGS@ +MATE_LIBS = @MATE_LIBS@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ @@ -152,8 +152,8 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBATASMART_CFLAGS = @LIBATASMART_CFLAGS@ LIBATASMART_LIBS = @LIBATASMART_LIBS@ -LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ -LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ +LIBMATENOTIFY_CFLAGS = @LIBMATENOTIFY_CFLAGS@ +LIBMATENOTIFY_LIBS = @LIBMATENOTIFY_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBSENSORS_CFLAGS = @LIBSENSORS_CFLAGS@ @@ -257,7 +257,7 @@ top_srcdir = @top_srcdir@ # SONYPI plugin plugindir = $(libdir)/sensors-applet/plugins -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff --git a/plugins/udisks/Makefile.am b/plugins/udisks/Makefile.am index 8d5a3a3..d092fe4 100644 --- a/plugins/udisks/Makefile.am +++ b/plugins/udisks/Makefile.am @@ -1,7 +1,7 @@ # UDisks plugin plugindir = $(libdir)/sensors-applet/plugins -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff --git a/plugins/udisks/Makefile.in b/plugins/udisks/Makefile.in index 0e80b2f..db2e3a4 100644 --- a/plugins/udisks/Makefile.in +++ b/plugins/udisks/Makefile.in @@ -131,8 +131,8 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ +MATE_CFLAGS = @MATE_CFLAGS@ +MATE_LIBS = @MATE_LIBS@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ @@ -152,8 +152,8 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBATASMART_CFLAGS = @LIBATASMART_CFLAGS@ LIBATASMART_LIBS = @LIBATASMART_LIBS@ -LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ -LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ +LIBMATENOTIFY_CFLAGS = @LIBMATENOTIFY_CFLAGS@ +LIBMATENOTIFY_LIBS = @LIBMATENOTIFY_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBSENSORS_CFLAGS = @LIBSENSORS_CFLAGS@ @@ -257,7 +257,7 @@ top_srcdir = @top_srcdir@ # UDisks plugin plugindir = $(libdir)/sensors-applet/plugins -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ diff --git a/po/ChangeLog b/po/ChangeLog index 0b83901..c479c5c 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -63,7 +63,7 @@ * fi.po, POTFILES.skip, POTFILES.in: Added Finnish translation Added POTFILES.skip - Added src/sensors-applet-gconf.c to POTFILES.in + Added src/sensors-applet-mateconf.c to POTFILES.in 2006-01-08 Alex Murray <[email protected]> diff --git a/po/POTFILES.in b/po/POTFILES.in index 3e51e0b..0a7f17d 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -18,4 +18,4 @@ sensors-applet/active-sensor.c sensors-applet/about-dialog.c sensors-applet/sensor-config-dialog.c sensors-applet/sensors-applet.c -sensors-applet/sensors-applet-gconf.c +sensors-applet/sensors-applet-mateconf.c @@ -385,15 +385,15 @@ msgstr "Při nahrávání uložených dat senzorů došlo k chybě" msgid "No sensors enabled!" msgstr "Senzory nejsou k dispozici!" -#: ../sensors-applet/sensors-applet-gconf.c:44 +#: ../sensors-applet/sensors-applet-mateconf.c:44 msgid "An error occurred loading the stored sensors data" msgstr "Při nahrávání uložených dat senzorů došlo k chybě" -#: ../sensors-applet/sensors-applet-gconf.c:45 +#: ../sensors-applet/sensors-applet-mateconf.c:45 msgid "Incompatible sensors configuration found" msgstr "Byla nalezena nekompatibilní konfigurace senzorů" -#: ../sensors-applet/sensors-applet-gconf.c:49 +#: ../sensors-applet/sensors-applet-mateconf.c:49 msgid "" "An error has occurred when loading the stored sensors data. The default " "values will be used to recover from this error." @@ -401,9 +401,9 @@ msgstr "" "Při nahrávání uložených dat senzorů došlo k chybě. Budou použity výchozí " "hodnoty." -#: ../sensors-applet/sensors-applet-gconf.c:52 +#: ../sensors-applet/sensors-applet-mateconf.c:52 msgid "" -"Unfortunately the previous configuration for GNOME Sensors Applet is not " +"Unfortunately the previous configuration for MATE Sensors Applet is not " "compatible with this version. The existing sensors data will be overwritten " "with the default values for this new version." msgstr "" @@ -6,7 +6,7 @@ # msgid "" msgstr "" -"Project-Id-Version: GNOME Sensors Applet\n" +"Project-Id-Version: MATE Sensors Applet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-11-21 14:29+1030\n" "PO-Revision-Date: \n" @@ -387,15 +387,15 @@ msgstr "Während des Ladens der Sensordaten ist ein Fehler aufgetreten" msgid "No sensors enabled!" msgstr "Keine Sensoren aktiviert!" -#: ../sensors-applet/sensors-applet-gconf.c:44 +#: ../sensors-applet/sensors-applet-mateconf.c:44 msgid "An error occurred loading the stored sensors data" msgstr "Während des Ladens der Sensordaten ist ein Fehler aufgetreten" -#: ../sensors-applet/sensors-applet-gconf.c:45 +#: ../sensors-applet/sensors-applet-mateconf.c:45 msgid "Incompatible sensors configuration found" msgstr "Inkompatible Sensorkonfiguration gefunden" -#: ../sensors-applet/sensors-applet-gconf.c:49 +#: ../sensors-applet/sensors-applet-mateconf.c:49 msgid "" "An error has occurred when loading the stored sensors data. The default " "values will be used to recover from this error." @@ -403,9 +403,9 @@ msgstr "" "Während des Ladens der Sensordaten ist ein Fehler aufgetreten. Die " "Standardwerte werden verwendet." -#: ../sensors-applet/sensors-applet-gconf.c:52 +#: ../sensors-applet/sensors-applet-mateconf.c:52 msgid "" -"Unfortunately the previous configuration for GNOME Sensors Applet is not " +"Unfortunately the previous configuration for MATE Sensors Applet is not " "compatible with this version. The existing sensors data will be overwritten " "with the default values for this new version." msgstr "" @@ -1,12 +1,12 @@ -# Spanish translation of the GNOME Sensor Applet. +# Spanish translation of the MATE Sensor Applet. # Copyright (C) 2005 Alex Murray. -# This file is distributed under the same license as the GNOME Sensor Applet package. +# This file is distributed under the same license as the MATE Sensor Applet package. # Davy Defaud <[email protected]>, 2005. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: GNOME Sensor Applet 0.6.2\n" +"Project-Id-Version: MATE Sensor Applet 0.6.2\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-11-21 14:29+1030\n" "PO-Revision-Date: 2006-01-20 23:02+0100\n" @@ -401,23 +401,23 @@ msgstr "" msgid "No sensors enabled!" msgstr "¡No hay sensores activados!" -#: ../sensors-applet/sensors-applet-gconf.c:44 +#: ../sensors-applet/sensors-applet-mateconf.c:44 msgid "An error occurred loading the stored sensors data" msgstr "" -#: ../sensors-applet/sensors-applet-gconf.c:45 +#: ../sensors-applet/sensors-applet-mateconf.c:45 msgid "Incompatible sensors configuration found" msgstr "" -#: ../sensors-applet/sensors-applet-gconf.c:49 +#: ../sensors-applet/sensors-applet-mateconf.c:49 msgid "" "An error has occurred when loading the stored sensors data. The default " "values will be used to recover from this error." msgstr "" -#: ../sensors-applet/sensors-applet-gconf.c:52 +#: ../sensors-applet/sensors-applet-mateconf.c:52 msgid "" -"Unfortunately the previous configuration for GNOME Sensors Applet is not " +"Unfortunately the previous configuration for MATE Sensors Applet is not " "compatible with this version. The existing sensors data will be overwritten " "with the default values for this new version." msgstr "" @@ -1,4 +1,4 @@ -# Finnish translation for the GNOME Sensors Applet. +# Finnish translation for the MATE Sensors Applet. # Copyright © 2005 Lauri Nurmi. # This file is distributed under the same license as the sensors-applet package. # Lauri Nurmi <[email protected]>, 2005. @@ -10,7 +10,7 @@ msgstr "" "POT-Creation-Date: 2009-11-21 14:29+1030\n" "PO-Revision-Date: 2005-11-17 01:15+0200\n" "Last-Translator: Lauri Nurmi <[email protected]>\n" -"Language-Team: GFTT <[email protected]>\n" +"Language-Team: GFTT <[email protected]>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -235,7 +235,7 @@ msgid "" msgstr "" "Lauri Nurmi, 2005\n" "\n" -"http://www.gnome.fi/" +"http://www.mate.fi/" #: ../sensors-applet/sensor-config-dialog.c:394 #, fuzzy @@ -399,23 +399,23 @@ msgstr "" msgid "No sensors enabled!" msgstr "Antureita ei ole käytössä!" -#: ../sensors-applet/sensors-applet-gconf.c:44 +#: ../sensors-applet/sensors-applet-mateconf.c:44 msgid "An error occurred loading the stored sensors data" msgstr "" -#: ../sensors-applet/sensors-applet-gconf.c:45 +#: ../sensors-applet/sensors-applet-mateconf.c:45 msgid "Incompatible sensors configuration found" msgstr "" -#: ../sensors-applet/sensors-applet-gconf.c:49 +#: ../sensors-applet/sensors-applet-mateconf.c:49 msgid "" "An error has occurred when loading the stored sensors data. The default " "values will be used to recover from this error." msgstr "" -#: ../sensors-applet/sensors-applet-gconf.c:52 +#: ../sensors-applet/sensors-applet-mateconf.c:52 msgid "" -"Unfortunately the previous configuration for GNOME Sensors Applet is not " +"Unfortunately the previous configuration for MATE Sensors Applet is not " "compatible with this version. The existing sensors data will be overwritten " "with the default values for this new version." msgstr "" @@ -1,13 +1,13 @@ -# French translation of the GNOME Sensor Applet. +# French translation of the MATE Sensor Applet. # Copyright (C) 2005 Alex Murray. -# This file is distributed under the same license as the GNOME Sensor Applet package. +# This file is distributed under the same license as the MATE Sensor Applet package. # Davy Defaud <[email protected]>, 2005. # Davy Defaud <[email protected]>, 2006. # # msgid "" msgstr "" -"Project-Id-Version: GNOME Sensor Applet 1.7.10\n" +"Project-Id-Version: MATE Sensor Applet 1.7.10\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-11-21 14:29+1030\n" "PO-Revision-Date: 2006-11-24 11:51+0100\n" @@ -386,16 +386,16 @@ msgstr "" msgid "No sensors enabled!" msgstr "Aucun capteur activé!" -#: ../sensors-applet/sensors-applet-gconf.c:44 +#: ../sensors-applet/sensors-applet-mateconf.c:44 msgid "An error occurred loading the stored sensors data" msgstr "" "Une erreur est survenue lors du chargement des préférences des capteurs" -#: ../sensors-applet/sensors-applet-gconf.c:45 +#: ../sensors-applet/sensors-applet-mateconf.c:45 msgid "Incompatible sensors configuration found" msgstr "Configuration de capteurs incompatible" -#: ../sensors-applet/sensors-applet-gconf.c:49 +#: ../sensors-applet/sensors-applet-mateconf.c:49 msgid "" "An error has occurred when loading the stored sensors data. The default " "values will be used to recover from this error." @@ -403,13 +403,13 @@ msgstr "" "Une erreur est survenue lors du chargement des préférences des capteurs.Les " "valeurs par défaut vont être utilisées." -#: ../sensors-applet/sensors-applet-gconf.c:52 +#: ../sensors-applet/sensors-applet-mateconf.c:52 msgid "" -"Unfortunately the previous configuration for GNOME Sensors Applet is not " +"Unfortunately the previous configuration for MATE Sensors Applet is not " "compatible with this version. The existing sensors data will be overwritten " "with the default values for this new version." msgstr "" -"La configuration précédente du moniteur matériel GNOME Sensors Applet n'est " +"La configuration précédente du moniteur matériel MATE Sensors Applet n'est " "pas compatible avec cette version. Les préférences de capteurs vont être " "remplacées par leurs valeurs par défaut pour cette nouvelle version." @@ -6,7 +6,7 @@ # msgid "" msgstr "" -"Project-Id-Version: GNOME Sensors Applet\n" +"Project-Id-Version: MATE Sensors Applet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-11-21 14:29+1030\n" "PO-Revision-Date: 2006-11-26 12:17+0100\n" @@ -385,15 +385,15 @@ msgstr "Hiba történt az elmentett szenzorbeállítások betöltésekor" msgid "No sensors enabled!" msgstr "Nincs engedélyezett szenzor!" -#: ../sensors-applet/sensors-applet-gconf.c:44 +#: ../sensors-applet/sensors-applet-mateconf.c:44 msgid "An error occurred loading the stored sensors data" msgstr "Hiba történt az elmentett szenzorbeállítások betöltésekor" -#: ../sensors-applet/sensors-applet-gconf.c:45 +#: ../sensors-applet/sensors-applet-mateconf.c:45 msgid "Incompatible sensors configuration found" msgstr "Nem kompatibilis szenzor beállítást találtam" -#: ../sensors-applet/sensors-applet-gconf.c:49 +#: ../sensors-applet/sensors-applet-mateconf.c:49 msgid "" "An error has occurred when loading the stored sensors data. The default " "values will be used to recover from this error." @@ -401,12 +401,12 @@ msgstr "" "Hiba történt az elmentett szenzorbeállítások betöltésekor. Az " "alapértelmezett értékek lesznek betöltve." -#: ../sensors-applet/sensors-applet-gconf.c:52 +#: ../sensors-applet/sensors-applet-mateconf.c:52 msgid "" -"Unfortunately the previous configuration for GNOME Sensors Applet is not " +"Unfortunately the previous configuration for MATE Sensors Applet is not " "compatible with this version. The existing sensors data will be overwritten " "with the default values for this new version." msgstr "" -"Sajnos az előző GNOME Sensors Applet verzió beállításai nem kompatibilisek " +"Sajnos az előző MATE Sensors Applet verzió beállításai nem kompatibilisek " "ezzel a verzióéval. A jelenlegi beállítások felül lesznek írva az új verzió " "alapértelmezett értékeivel." @@ -394,15 +394,15 @@ msgstr "" msgid "No sensors enabled!" msgstr "Nessun sensore attivo!" -#: ../sensors-applet/sensors-applet-gconf.c:42 +#: ../sensors-applet/sensors-applet-mateconf.c:42 msgid "An error occurred loading the stored sensors data" msgstr "Si è verificato un errore caricando i dati memorizzati dei sensori" -#: ../sensors-applet/sensors-applet-gconf.c:43 +#: ../sensors-applet/sensors-applet-mateconf.c:43 msgid "Incompatible sensors configuration found" msgstr "Trovata una configurazione dei sensori incompatibile" -#: ../sensors-applet/sensors-applet-gconf.c:47 +#: ../sensors-applet/sensors-applet-mateconf.c:47 msgid "" "An error has occurred when loading the stored sensors data. The default " "values will be used to recover from this error." @@ -410,13 +410,13 @@ msgstr "" "Si è verificato un errore nel caricamento dei dati memorizzati dei sensori. " "I valori predefiniti saranno usati per correggere questo errore." -#: ../sensors-applet/sensors-applet-gconf.c:50 +#: ../sensors-applet/sensors-applet-mateconf.c:50 msgid "" -"Unfortunately the previous configuration for GNOME Sensors Applet is not " +"Unfortunately the previous configuration for MATE Sensors Applet is not " "compatible with this version. The existing sensors data will be overwritten " "with the default values for this new version." msgstr "" -"Sfortunatamente la configurazione precedente per GNOME Sensors Applet non " +"Sfortunatamente la configurazione precedente per MATE Sensors Applet non " "è compatibile con questa versione. I dati esistenti di sensori verranno sovrascritti " "con i valori predefiniti di questa nuova versione." @@ -388,23 +388,23 @@ msgstr "" msgid "No sensors enabled!" msgstr "Brak aktywnych czujników!" -#: ../sensors-applet/sensors-applet-gconf.c:44 +#: ../sensors-applet/sensors-applet-mateconf.c:44 msgid "An error occurred loading the stored sensors data" msgstr "" -#: ../sensors-applet/sensors-applet-gconf.c:45 +#: ../sensors-applet/sensors-applet-mateconf.c:45 msgid "Incompatible sensors configuration found" msgstr "" -#: ../sensors-applet/sensors-applet-gconf.c:49 +#: ../sensors-applet/sensors-applet-mateconf.c:49 msgid "" "An error has occurred when loading the stored sensors data. The default " "values will be used to recover from this error." msgstr "" -#: ../sensors-applet/sensors-applet-gconf.c:52 +#: ../sensors-applet/sensors-applet-mateconf.c:52 msgid "" -"Unfortunately the previous configuration for GNOME Sensors Applet is not " +"Unfortunately the previous configuration for MATE Sensors Applet is not " "compatible with this version. The existing sensors data will be overwritten " "with the default values for this new version." msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 23069dd..e78eedc 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1,18 +1,18 @@ -# French translation of the GNOME Sensor Applet. +# French translation of the MATE Sensor Applet. # Copyright (C) 2005 Alex Murray. -# This file is distributed under the same license as the GNOME Sensor Applet package. +# This file is distributed under the same license as the MATE Sensor Applet package. # Davy Defaud <[email protected]>, 2005. # Davy Defaud <[email protected]>, 2006. # # msgid "" msgstr "" -"Project-Id-Version: GNOME Sensor Applet 1.7.10\n" +"Project-Id-Version: MATE Sensor Applet 1.7.10\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-11-21 14:29+1030\n" "PO-Revision-Date: 2008-03-08 18:30-0300\n" "Last-Translator: Amadeu A. Barbosa Jr <[email protected]>\n" -"Language-Team: Brazilian Portuguese <[email protected]>\n" +"Language-Team: Brazilian Portuguese <[email protected]>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -389,15 +389,15 @@ msgstr "" msgid "No sensors enabled!" msgstr "Nenhum sensor ativo!" -#: ../sensors-applet/sensors-applet-gconf.c:44 +#: ../sensors-applet/sensors-applet-mateconf.c:44 msgid "An error occurred loading the stored sensors data" msgstr "Um erro ocorreu ao tentar carregar os dados do sensor" -#: ../sensors-applet/sensors-applet-gconf.c:45 +#: ../sensors-applet/sensors-applet-mateconf.c:45 msgid "Incompatible sensors configuration found" msgstr "Não foi possível encontrar sensores compatíveis" -#: ../sensors-applet/sensors-applet-gconf.c:49 +#: ../sensors-applet/sensors-applet-mateconf.c:49 msgid "" "An error has occurred when loading the stored sensors data. The default " "values will be used to recover from this error." @@ -405,14 +405,14 @@ msgstr "" "Um erro ocorreu ao tentar carregar os dados do sensor. Os valores padrões " "serão usados para recuperar-se deste erro." -#: ../sensors-applet/sensors-applet-gconf.c:52 +#: ../sensors-applet/sensors-applet-mateconf.c:52 msgid "" -"Unfortunately the previous configuration for GNOME Sensors Applet is not " +"Unfortunately the previous configuration for MATE Sensors Applet is not " "compatible with this version. The existing sensors data will be overwritten " "with the default values for this new version." msgstr "" "Infelizmente as configurações anteriores do Miniaplicativo de Sensores do " -"GNOME são incompatíveis com esta versão. Os dados de sensores serão " +"MATE são incompatíveis com esta versão. Os dados de sensores serão " "sobrescritos com os valores padrões para esta versão nova." #~ msgid "Number of _samples per graph" @@ -6,7 +6,7 @@ # msgid "" msgstr "" -"Project-Id-Version: GNOME Sensors Applet\n" +"Project-Id-Version: MATE Sensors Applet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-11-21 14:29+1030\n" "PO-Revision-Date: 2005-02-19 19:06+0200\n" @@ -401,23 +401,23 @@ msgstr "" msgid "No sensors enabled!" msgstr "Nu sunt activaţi senzorii!" -#: ../sensors-applet/sensors-applet-gconf.c:44 +#: ../sensors-applet/sensors-applet-mateconf.c:44 msgid "An error occurred loading the stored sensors data" msgstr "" -#: ../sensors-applet/sensors-applet-gconf.c:45 +#: ../sensors-applet/sensors-applet-mateconf.c:45 msgid "Incompatible sensors configuration found" msgstr "" -#: ../sensors-applet/sensors-applet-gconf.c:49 +#: ../sensors-applet/sensors-applet-mateconf.c:49 msgid "" "An error has occurred when loading the stored sensors data. The default " "values will be used to recover from this error." msgstr "" -#: ../sensors-applet/sensors-applet-gconf.c:52 +#: ../sensors-applet/sensors-applet-mateconf.c:52 msgid "" -"Unfortunately the previous configuration for GNOME Sensors Applet is not " +"Unfortunately the previous configuration for MATE Sensors Applet is not " "compatible with this version. The existing sensors data will be overwritten " "with the default values for this new version." msgstr "" @@ -1,18 +1,18 @@ -# Russian translation of the GNOME Sensor Applet. +# Russian translation of the MATE Sensor Applet. # Copyright (C) 2005 Alex Murray. -# This file is distributed under the same license as the GNOME Sensor Applet package. +# This file is distributed under the same license as the MATE Sensor Applet package. # Mikhael Korneev <[email protected]>, 2005. # Gankov Andrey <[email protected]>, 2009 # # msgid "" msgstr "" -"Project-Id-Version: GNOME Sensor Applet 2.2.4\n" +"Project-Id-Version: MATE Sensor Applet 2.2.4\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-11-21 14:29+1030\n" "PO-Revision-Date: 2009-09-02 00:13+0400\n" "Last-Translator: Gankov Andrey <[email protected]>\n" -"Language-Team: Russian <[email protected]>\n" +"Language-Team: Russian <[email protected]>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -391,15 +391,15 @@ msgstr "" msgid "No sensors enabled!" msgstr "Нет включенных датчиков!" -#: ../sensors-applet/sensors-applet-gconf.c:44 +#: ../sensors-applet/sensors-applet-mateconf.c:44 msgid "An error occurred loading the stored sensors data" msgstr "Произошла ошибка при загрузке информации о датчиках" -#: ../sensors-applet/sensors-applet-gconf.c:45 +#: ../sensors-applet/sensors-applet-mateconf.c:45 msgid "Incompatible sensors configuration found" msgstr "Найдена несовместимая конфигурация датчиков" -#: ../sensors-applet/sensors-applet-gconf.c:49 +#: ../sensors-applet/sensors-applet-mateconf.c:49 msgid "" "An error has occurred when loading the stored sensors data. The default " "values will be used to recover from this error." @@ -407,13 +407,13 @@ msgstr "" "Ошибка произошла при загрузке информации о датчиках.Для восстановления будут " "использованы значения по умолчанию." -#: ../sensors-applet/sensors-applet-gconf.c:52 +#: ../sensors-applet/sensors-applet-mateconf.c:52 msgid "" -"Unfortunately the previous configuration for GNOME Sensors Applet is not " +"Unfortunately the previous configuration for MATE Sensors Applet is not " "compatible with this version. The existing sensors data will be overwritten " "with the default values for this new version." msgstr "" -"К сожалению предыдущая конфигурация GNOME·Sensors·Applet не совместима с " +"К сожалению предыдущая конфигурация MATE·Sensors·Applet не совместима с " "текущей версией. Имеющиеся данные о датчиках будутзаменены на значения по " "умолчанию для новой версии." @@ -1,11 +1,11 @@ -# Swedish translation of the GNOME Sensor Applet. +# Swedish translation of the MATE Sensor Applet. # Copyright (C) 2005, 2006 Alex Murray. -# This file is distributed under the same license as the GNOME Sensor Applet package. +# This file is distributed under the same license as the MATE Sensor Applet package. # Daniel Nylander <[email protected]>, 2006. # msgid "" msgstr "" -"Project-Id-Version: GNOME Sensor Applet 1.7.7\n" +"Project-Id-Version: MATE Sensor Applet 1.7.7\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-11-21 14:29+1030\n" "PO-Revision-Date: 2006-09-05 16:34+0100\n" @@ -384,23 +384,23 @@ msgstr "" msgid "No sensors enabled!" msgstr "Inga sensorer är aktiverade!" -#: ../sensors-applet/sensors-applet-gconf.c:44 +#: ../sensors-applet/sensors-applet-mateconf.c:44 msgid "An error occurred loading the stored sensors data" msgstr "" -#: ../sensors-applet/sensors-applet-gconf.c:45 +#: ../sensors-applet/sensors-applet-mateconf.c:45 msgid "Incompatible sensors configuration found" msgstr "" -#: ../sensors-applet/sensors-applet-gconf.c:49 +#: ../sensors-applet/sensors-applet-mateconf.c:49 msgid "" "An error has occurred when loading the stored sensors data. The default " "values will be used to recover from this error." msgstr "" -#: ../sensors-applet/sensors-applet-gconf.c:52 +#: ../sensors-applet/sensors-applet-mateconf.c:52 msgid "" -"Unfortunately the previous configuration for GNOME Sensors Applet is not " +"Unfortunately the previous configuration for MATE Sensors Applet is not " "compatible with this version. The existing sensors data will be overwritten " "with the default values for this new version." msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 7e4dac8..e4029e1 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,11 +1,11 @@ -# Spanish translation of the GNOME Sensor Applet. +# Spanish translation of the MATE Sensor Applet. # Copyright (C) 2005 Alex Murray. -# This file is distributed under the same license as the GNOME Sensor Applet package. +# This file is distributed under the same license as the MATE Sensor Applet package. # Davy Defaud <[email protected]>, 2005. # msgid "" msgstr "" -"Project-Id-Version: GNOME Sensor Applet 2.2.4\n" +"Project-Id-Version: MATE Sensor Applet 2.2.4\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-11-21 14:29+1030\n" "PO-Revision-Date: 2009-08-14 19:41+0800\n" @@ -382,23 +382,23 @@ msgstr "" msgid "No sensors enabled!" msgstr "没有启动传感器!" -#: ../sensors-applet/sensors-applet-gconf.c:44 +#: ../sensors-applet/sensors-applet-mateconf.c:44 msgid "An error occurred loading the stored sensors data" msgstr "在加载传感器数据时发生错误" -#: ../sensors-applet/sensors-applet-gconf.c:45 +#: ../sensors-applet/sensors-applet-mateconf.c:45 msgid "Incompatible sensors configuration found" msgstr "" -#: ../sensors-applet/sensors-applet-gconf.c:49 +#: ../sensors-applet/sensors-applet-mateconf.c:49 msgid "" "An error has occurred when loading the stored sensors data. The default " "values will be used to recover from this error." msgstr "" -#: ../sensors-applet/sensors-applet-gconf.c:52 +#: ../sensors-applet/sensors-applet-mateconf.c:52 msgid "" -"Unfortunately the previous configuration for GNOME Sensors Applet is not " +"Unfortunately the previous configuration for MATE Sensors Applet is not " "compatible with this version. The existing sensors data will be overwritten " "with the default values for this new version." msgstr "" diff --git a/sensors-applet/Makefile.am b/sensors-applet/Makefile.am index a87feb0..bce8d57 100644 --- a/sensors-applet/Makefile.am +++ b/sensors-applet/Makefile.am @@ -1,5 +1,5 @@ ## Process this file with automake to produce Makefile.in -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ @@ -8,16 +8,16 @@ INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ -DPREFIX=\""$(prefix)"\" \ -I$(top_srcdir) \ - $(GLIB_CFLAGS) $(GTK_CFLAGS) $(GNOME_CFLAGS) $(CAIRO_CFLAGS) $(LIBNOTIFY_CFLAGS) + $(GLIB_CFLAGS) $(GTK_CFLAGS) $(MATE_CFLAGS) $(CAIRO_CFLAGS) $(LIBMATENOTIFY_CFLAGS) -LIBS = $(GLIB_LIBS) $(GTK_LIBS) $(GNOME_LIBS) $(CAIRO_LIBS) $(LIBNOTIFY_LIBS) +LIBS = $(GLIB_LIBS) $(GTK_LIBS) $(MATE_LIBS) $(CAIRO_LIBS) $(LIBMATENOTIFY_LIBS) -if LIBNOTIFY -libnotify_SRC = active-sensor-libnotify.c \ - active-sensor-libnotify.h +if LIBMATENOTIFY +libmatenotify_SRC = active-sensor-libmatenotify.c \ + active-sensor-libmatenotify.h else -libnotify_SRC = +libmatenotify_SRC = endif libexec_PROGRAMS = sensors-applet @@ -35,9 +35,9 @@ sensors_applet_SOURCES = main.c \ sensors-applet-sensor.h \ sensors-applet-plugins.c \ sensors-applet-plugins.h \ - sensors-applet-gconf.c \ - sensors-applet-gconf.h \ - $(libnotify_SRC) + sensors-applet-mateconf.c \ + sensors-applet-mateconf.h \ + $(libmatenotify_SRC) # install headers for plugins to use INST_H_FILES = sensors-applet-plugin.h sensors-applet-sensor.h diff --git a/sensors-applet/Makefile.in b/sensors-applet/Makefile.in index dd6765f..e69178a 100644 --- a/sensors-applet/Makefile.in +++ b/sensors-applet/Makefile.in @@ -54,14 +54,14 @@ am__sensors_applet_SOURCES_DIST = main.c about-dialog.c about-dialog.h \ sensor-config-dialog.c sensor-config-dialog.h sensors-applet.c \ sensors-applet.h sensors-applet-sensor.h \ sensors-applet-plugins.c sensors-applet-plugins.h \ - sensors-applet-gconf.c sensors-applet-gconf.h \ - active-sensor-libnotify.c active-sensor-libnotify.h -@LIBNOTIFY_TRUE@am__objects_1 = active-sensor-libnotify.$(OBJEXT) + sensors-applet-mateconf.c sensors-applet-mateconf.h \ + active-sensor-libmatenotify.c active-sensor-libmatenotify.h +@LIBMATENOTIFY_TRUE@am__objects_1 = active-sensor-libmatenotify.$(OBJEXT) am_sensors_applet_OBJECTS = main.$(OBJEXT) about-dialog.$(OBJEXT) \ active-sensor.$(OBJEXT) prefs-dialog.$(OBJEXT) \ sensor-config-dialog.$(OBJEXT) sensors-applet.$(OBJEXT) \ sensors-applet-plugins.$(OBJEXT) \ - sensors-applet-gconf.$(OBJEXT) $(am__objects_1) + sensors-applet-mateconf.$(OBJEXT) $(am__objects_1) sensors_applet_OBJECTS = $(am_sensors_applet_OBJECTS) sensors_applet_LDADD = $(LDADD) DEFAULT_INCLUDES = -I.@am__isrc@ @@ -143,8 +143,8 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ +MATE_CFLAGS = @MATE_CFLAGS@ +MATE_LIBS = @MATE_LIBS@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ @@ -164,10 +164,10 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBATASMART_CFLAGS = @LIBATASMART_CFLAGS@ LIBATASMART_LIBS = @LIBATASMART_LIBS@ -LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ -LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ +LIBMATENOTIFY_CFLAGS = @LIBMATENOTIFY_CFLAGS@ +LIBMATENOTIFY_LIBS = @LIBMATENOTIFY_LIBS@ LIBOBJS = @LIBOBJS@ -LIBS = $(GLIB_LIBS) $(GTK_LIBS) $(GNOME_LIBS) $(CAIRO_LIBS) $(LIBNOTIFY_LIBS) +LIBS = $(GLIB_LIBS) $(GTK_LIBS) $(MATE_LIBS) $(CAIRO_LIBS) $(LIBMATENOTIFY_LIBS) LIBSENSORS_CFLAGS = @LIBSENSORS_CFLAGS@ LIBSENSORS_LIBS = @LIBSENSORS_LIBS@ LIBTOOL = @LIBTOOL@ @@ -266,7 +266,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ +INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \ -DG_LOG_DOMAIN=\""Sensors Applet"\" \ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -DDATADIR=\""$(datadir)"\" \ @@ -275,11 +275,11 @@ INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ -DPREFIX=\""$(prefix)"\" \ -I$(top_srcdir) \ - $(GLIB_CFLAGS) $(GTK_CFLAGS) $(GNOME_CFLAGS) $(CAIRO_CFLAGS) $(LIBNOTIFY_CFLAGS) + $(GLIB_CFLAGS) $(GTK_CFLAGS) $(MATE_CFLAGS) $(CAIRO_CFLAGS) $(LIBMATENOTIFY_CFLAGS) -@LIBNOTIFY_FALSE@libnotify_SRC = -@LIBNOTIFY_TRUE@libnotify_SRC = active-sensor-libnotify.c \ -@LIBNOTIFY_TRUE@ active-sensor-libnotify.h +@LIBMATENOTIFY_FALSE@libmatenotify_SRC = +@LIBMATENOTIFY_TRUE@libmatenotify_SRC = active-sensor-libmatenotify.c \ +@LIBMATENOTIFY_TRUE@ active-sensor-libmatenotify.h sensors_applet_SOURCES = main.c \ about-dialog.c \ @@ -295,9 +295,9 @@ sensors_applet_SOURCES = main.c \ sensors-applet-sensor.h \ sensors-applet-plugins.c \ sensors-applet-plugins.h \ - sensors-applet-gconf.c \ - sensors-applet-gconf.h \ - $(libnotify_SRC) + sensors-applet-mateconf.c \ + sensors-applet-mateconf.h \ + $(libmatenotify_SRC) # install headers for plugins to use @@ -413,12 +413,12 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/about-dialog.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/active-sensor-libnotify.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/active-sensor-libmatenotify.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/active-sensor.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prefs-dialog.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sensor-config-dialog.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sensors-applet-gconf.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sensors-applet-mateconf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sensors-applet-plugins.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sensors-applet.Po@am__quote@ diff --git a/sensors-applet/about-dialog.c b/sensors-applet/about-dialog.c index 27a86f1..0a538d2 100644 --- a/sensors-applet/about-dialog.c +++ b/sensors-applet/about-dialog.c @@ -20,7 +20,7 @@ #include "config.h" #endif /* HAVE_CONFIG_H */ -#include <gnome.h> +#include <mate.h> #include "about-dialog.h" void about_dialog_open(SensorsApplet *sensors_applet) { diff --git a/sensors-applet/active-sensor-libmatenotify.c b/sensors-applet/active-sensor-libmatenotify.c new file mode 100644 index 0000000..a81f4f0 --- /dev/null +++ b/sensors-applet/active-sensor-libmatenotify.c @@ -0,0 +1,113 @@ +/* + * Copyright (C) 2005-2009 Alex Murray <[email protected]> + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif /* HAVE_CONFIG_H */ + +#ifdef HAVE_LIBMATENOTIFY +#include <libmatenotify/notify.h> +#endif + +#include "active-sensor-libmatenotify.h" + +static void notif_closed_cb(NotifyNotification *notification, + ActiveSensor *active_sensor) +{ + g_assert(notification != NULL && active_sensor != NULL); + + int i; + + g_debug("Notification was closed.. setting reference to NULL so we can show again if needed."); + + // set notif reference to NULL + for (i = 0; i < NUM_NOTIFS; i++) { + if (active_sensor->notification[i] == notification) { + active_sensor->notification[i] = NULL; + break; + } + } +} + + +void active_sensor_libmatenotify_notify_end(ActiveSensor *active_sensor, + NotifType notif_type) { + GError *error = NULL; + if (active_sensor->notification[notif_type]) { + g_debug("Closing notification"); + if(!notify_notification_close(active_sensor->notification[notif_type], + &error)) { + g_warning("Error closing notification: %s", error->message); + g_error_free(error); + } + g_object_unref(active_sensor->notification[notif_type]); + active_sensor->notification[notif_type] = NULL; + } +} + +void active_sensor_libmatenotify_notify(ActiveSensor *active_sensor, + NotifType notif_type, + const gchar *summary, + const gchar *message, + const gchar *icon_filename, + gint timeout_msecs, + GtkWidget *attach) { + GError *error = NULL; + + if (!notify_is_initted()) { + if (!notify_init(PACKAGE)) { + return; + } + } + g_debug("Doing notification %s: %s: %s", (notif_type == SENSOR_INTERFACE_ERROR ? "interface-error" : "other") ,summary, message); + + /* leave any existing notification since most likely hasn't changed */ + if (active_sensor->notification[notif_type] != NULL) { + return; +/* active_sensor_libmatenotify_notify_end(active_sensor, notif_type); */ + } + + /* now create a new one */ + g_debug("Creating new notification"); + active_sensor->notification[notif_type] = notify_notification_new(summary, + message, + icon_filename, + attach); + g_signal_connect(active_sensor->notification[notif_type], "closed", + G_CALLBACK(notif_closed_cb), + active_sensor); + + notify_notification_set_urgency(active_sensor->notification[notif_type], + NOTIFY_URGENCY_CRITICAL); + + + /* timeout may have changed so update it */ + notify_notification_set_timeout(active_sensor->notification[notif_type], + timeout_msecs); + + + g_debug("showing notification"); + if (!notify_notification_show(active_sensor->notification[notif_type], &error)) { + g_debug("Error showing notification: %s", error->message); + g_error_free(error); + } + + + +} + diff --git a/sensors-applet/active-sensor-libmatenotify.h b/sensors-applet/active-sensor-libmatenotify.h new file mode 100644 index 0000000..9ec3729 --- /dev/null +++ b/sensors-applet/active-sensor-libmatenotify.h @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2005-2009 Alex Murray <[email protected]> + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef ACTIVE_SESNOR_LIBMATENOTIFY_H +#define ACTIVE_SENSOR_LIBMATENOTIFY_H + +#include "sensors-applet.h" +#include "active-sensor.h" + +void active_sensor_libmatenotify_notify(ActiveSensor *active_sensor, + NotifType notif_type, + const gchar *summary, + const gchar *message, + const gchar *icon_filename, + gint timeout_msecs, + GtkWidget *attach); +void active_sensor_libmatenotify_notify_end(ActiveSensor *active_sensor, + NotifType notif_type); + +#endif /* SENSORS_APPLET_LIBMATENOTIFY_H */ diff --git a/sensors-applet/active-sensor.c b/sensors-applet/active-sensor.c index 84b84cc..50dccef 100644 --- a/sensors-applet/active-sensor.c +++ b/sensors-applet/active-sensor.c @@ -24,12 +24,12 @@ #include <string.h> #endif /* HAVE_STRING_H */ -#include <gconf/gconf-client.h> -#include <gnome.h> +#include <mateconf/mateconf-client.h> +#include <mate.h> #include "active-sensor.h" #include "sensors-applet-plugins.h" -#include "sensors-applet-gconf.h" +#include "sensors-applet-mateconf.h" typedef enum { VERY_LOW_SENSOR_VALUE = 0, @@ -80,7 +80,7 @@ static gboolean active_sensor_execute_alarm(ActiveSensor *active_sensor, (notif_type == LOW_ALARM ? "LOW" : "HIGH"), active_sensor->alarm_command[notif_type]); - pid = gnome_execute_shell(NULL, + pid = mate_execute_shell(NULL, active_sensor->alarm_command[notif_type]); g_debug("Command executed in shell with pid %d", pid); @@ -426,7 +426,7 @@ void active_sensor_update_graph_dimensions(ActiveSensor *as, ActiveSensor *active_sensor_new(SensorsApplet *sensors_applet, GtkTreeRowReference *sensor_row) { ActiveSensor *active_sensor; - PanelAppletOrient orient; + MatePanelAppletOrient orient; gint graph_size; gboolean horizontal; @@ -459,12 +459,12 @@ ActiveSensor *active_sensor_new(SensorsApplet *sensors_applet, GDK_ALL_EVENTS_MASK); /* need to set size according to orientation */ - orient = panel_applet_get_orient(active_sensor->sensors_applet->applet); - graph_size = panel_applet_gconf_get_int(active_sensor->sensors_applet->applet, + orient = mate_panel_applet_get_orient(active_sensor->sensors_applet->applet); + graph_size = mate_panel_applet_mateconf_get_int(active_sensor->sensors_applet->applet, GRAPH_SIZE, NULL); - horizontal = ((orient == PANEL_APPLET_ORIENT_UP) || - (orient == PANEL_APPLET_ORIENT_DOWN)); + horizontal = ((orient == MATE_PANEL_APPLET_ORIENT_UP) || + (orient == MATE_PANEL_APPLET_ORIENT_DOWN)); active_sensor_set_graph_dimensions(active_sensor, (horizontal ? graph_size : sensors_applet->size), @@ -527,8 +527,8 @@ void active_sensor_update(ActiveSensor *active_sensor, gchar *tooltip = NULL; gchar *value_tooltip = NULL; - /* hidden gconf options */ - GConfClient *client; + /* hidden mateconf options */ + MateConfClient *client; gint font_size = 0; gboolean hide_units = FALSE; @@ -584,14 +584,14 @@ void active_sensor_update(ActiveSensor *active_sensor, * note this is not unique */ sensor_value = -1; } else { - /* use hidden gconf key for hide_units */ + /* use hidden mateconf key for hide_units */ - if ((client = gconf_client_get_default()) != NULL) { - hide_units = gconf_client_get_bool(client, + if ((client = mateconf_client_get_default()) != NULL) { + hide_units = mateconf_client_get_bool(client, "/apps/sensors-applet/" HIDE_UNITS, &error); if (error) { - g_debug("Could not get hide units from GConf - assuming false"); + g_debug("Could not get hide units from MateConf - assuming false"); hide_units = FALSE; g_error_free(error); error = NULL; @@ -606,7 +606,7 @@ void active_sensor_update(ActiveSensor *active_sensor, switch (sensor_type) { case TEMP_SENSOR: - scale = (TemperatureScale)panel_applet_gconf_get_int(sensors_applet->applet, TEMPERATURE_SCALE, NULL); + scale = (TemperatureScale)mate_panel_applet_mateconf_get_int(sensors_applet->applet, TEMPERATURE_SCALE, NULL); /* scale value */ sensor_value = sensors_applet_convert_temperature(sensor_value, CELSIUS, @@ -661,17 +661,17 @@ void active_sensor_update(ActiveSensor *active_sensor, g_free(value_tooltip); /* only do icons and labels / graphs if needed */ - display_mode = panel_applet_gconf_get_int(sensors_applet->applet, + display_mode = mate_panel_applet_mateconf_get_int(sensors_applet->applet, DISPLAY_MODE, NULL); /* most users wont have a font size set */ - if ((client = gconf_client_get_default()) != NULL) { - font_size = gconf_client_get_int(client, + if ((client = mateconf_client_get_default()) != NULL) { + font_size = mateconf_client_get_int(client, "/apps/sensors-applet/" FONT_SIZE, &error); if (error) { - g_debug("Could not get font size from GConf - assuming default size"); + g_debug("Could not get font size from MateConf - assuming default size"); font_size = 0; g_error_free(error); error = NULL; diff --git a/sensors-applet/active-sensor.h b/sensors-applet/active-sensor.h index 2d4674b..c72f175 100644 --- a/sensors-applet/active-sensor.h +++ b/sensors-applet/active-sensor.h @@ -19,9 +19,9 @@ #ifndef ACTIVE_SENSOR_H #define ACTIVE_SENSOR_H -#ifdef HAVE_LIBNOTIFY -#include <libnotify/notify.h> -#include "active-sensor-libnotify.h" +#ifdef HAVE_LIBMATENOTIFY +#include <libmatenotify/notify.h> +#include "active-sensor-libmatenotify.h" #endif #include "sensors-applet.h" @@ -40,7 +40,7 @@ struct _ActiveSensor { GtkTreeRowReference *sensor_row; -#ifdef HAVE_LIBNOTIFY +#ifdef HAVE_LIBMATENOTIFY NotifyNotification *notification[NUM_NOTIFS]; #endif diff --git a/sensors-applet/config.h.in b/sensors-applet/config.h.in index a32469b..a5d04de 100644 --- a/sensors-applet/config.h.in +++ b/sensors-applet/config.h.in @@ -36,8 +36,8 @@ /* Define if your <locale.h> file defines LC_MESSAGES. */ #undef HAVE_LC_MESSAGES -/* libnotify available */ -#undef HAVE_LIBNOTIFY +/* libmatenotify available */ +#undef HAVE_LIBMATENOTIFY /* libsensors is available */ #undef HAVE_LIBSENSORS diff --git a/sensors-applet/main.c b/sensors-applet/main.c index b04e9eb..ade7edd 100644 --- a/sensors-applet/main.c +++ b/sensors-applet/main.c @@ -20,11 +20,11 @@ #include "config.h" #endif /* HAVE_CONFIG_H */ -#include <panel-applet.h> +#include <mate-panel-applet.h> #include <string.h> #include "sensors-applet.h" -static gboolean sensors_applet_fill(PanelApplet *applet, +static gboolean sensors_applet_fill(MatePanelApplet *applet, const gchar *iid, gpointer data) { SensorsApplet *sensors_applet; @@ -38,7 +38,7 @@ static gboolean sensors_applet_fill(PanelApplet *applet, return retval; } -PANEL_APPLET_BONOBO_FACTORY ("OAFIID:SensorsApplet_Factory", +MATE_PANEL_APPLET_MATECOMPONENT_FACTORY ("OAFIID:SensorsApplet_Factory", PANEL_TYPE_APPLET, PACKAGE, PACKAGE_VERSION, diff --git a/sensors-applet/prefs-dialog.c b/sensors-applet/prefs-dialog.c index fc7d3ac..711fac9 100644 --- a/sensors-applet/prefs-dialog.c +++ b/sensors-applet/prefs-dialog.c @@ -20,8 +20,8 @@ #include "config.h" #endif /* HAVE_CONFIG_H */ -#include <libgnome/libgnome.h> -#include "sensors-applet-gconf.h" +#include <libmate/libmate.h> +#include "sensors-applet-mateconf.h" #include "prefs-dialog.h" #include "sensor-config-dialog.h" @@ -29,12 +29,12 @@ #define NEW_TEMP_SCALE 1 /* when a user closes the prefs-dialog we assume that applet is now - setup, so store all values in gconf */ + setup, so store all values in mateconf */ void prefs_dialog_close(SensorsApplet *sensors_applet) { if (sensors_applet->sensors != NULL) { - if (sensors_applet_gconf_save_sensors(sensors_applet)) - panel_applet_gconf_set_bool(sensors_applet->applet, + if (sensors_applet_mateconf_save_sensors(sensors_applet)) + mate_panel_applet_mateconf_set_bool(sensors_applet->applet, IS_SETUP, TRUE, NULL); } if (sensors_applet->prefs_dialog) { @@ -44,7 +44,7 @@ void prefs_dialog_close(SensorsApplet *sensors_applet) { } if (sensors_applet->timeout_id == 0) { - sensors_applet->timeout_id = g_timeout_add_seconds(panel_applet_gconf_get_int(sensors_applet->applet, TIMEOUT, NULL) / 1000, (GSourceFunc)sensors_applet_update_active_sensors, sensors_applet); + sensors_applet->timeout_id = g_timeout_add_seconds(mate_panel_applet_mateconf_get_int(sensors_applet->applet, TIMEOUT, NULL) / 1000, (GSourceFunc)sensors_applet_update_active_sensors, sensors_applet); } @@ -125,7 +125,7 @@ static void prefs_dialog_timeout_changed(GtkSpinButton *button, PrefsDialog *prefs_dialog) { gint value; value = (gint)(gtk_spin_button_get_value(button) * 1000); - panel_applet_gconf_set_int(prefs_dialog->sensors_applet->applet, TIMEOUT, value, NULL); + mate_panel_applet_mateconf_set_int(prefs_dialog->sensors_applet->applet, TIMEOUT, value, NULL); } static void prefs_dialog_display_mode_changed(GtkComboBox *display_mode_combo_box, @@ -149,7 +149,7 @@ static void prefs_dialog_display_mode_changed(GtkComboBox *display_mode_combo_bo gtk_widget_set_sensitive(GTK_WIDGET(prefs_dialog->graph_size_spinbutton), (display_mode == DISPLAY_GRAPH)); - panel_applet_gconf_set_int(prefs_dialog->sensors_applet->applet, + mate_panel_applet_mateconf_set_int(prefs_dialog->sensors_applet->applet, DISPLAY_MODE, gtk_combo_box_get_active(display_mode_combo_box), NULL); @@ -160,7 +160,7 @@ static void prefs_dialog_display_mode_changed(GtkComboBox *display_mode_combo_bo static void prefs_dialog_layout_mode_changed(GtkComboBox *layout_mode_combo_box, PrefsDialog *prefs_dialog) { - panel_applet_gconf_set_int(prefs_dialog->sensors_applet->applet, + mate_panel_applet_mateconf_set_int(prefs_dialog->sensors_applet->applet, LAYOUT_MODE, gtk_combo_box_get_active(layout_mode_combo_box), NULL); @@ -175,13 +175,13 @@ static void prefs_dialog_temperature_scale_changed(GtkComboBox *temperature_scal TemperatureScale scales[2]; GtkTreeModel *model; - scales[OLD_TEMP_SCALE] = (TemperatureScale)panel_applet_gconf_get_int(prefs_dialog->sensors_applet->applet, + scales[OLD_TEMP_SCALE] = (TemperatureScale)mate_panel_applet_mateconf_get_int(prefs_dialog->sensors_applet->applet, TEMPERATURE_SCALE, NULL); scales[NEW_TEMP_SCALE] = (TemperatureScale)gtk_combo_box_get_active(temperature_scale_combo_box); - panel_applet_gconf_set_int(prefs_dialog->sensors_applet->applet, + mate_panel_applet_mateconf_set_int(prefs_dialog->sensors_applet->applet, TEMPERATURE_SCALE, scales[NEW_TEMP_SCALE], NULL); @@ -198,14 +198,14 @@ static void prefs_dialog_temperature_scale_changed(GtkComboBox *temperature_scal } -#ifdef HAVE_LIBNOTIFY +#ifdef HAVE_LIBMATENOTIFY static void prefs_dialog_display_notifications_toggled(GtkCheckButton *display_notifications, PrefsDialog *prefs_dialog) { gboolean notify; notify = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(display_notifications)); - panel_applet_gconf_set_bool(prefs_dialog->sensors_applet->applet, + mate_panel_applet_mateconf_set_bool(prefs_dialog->sensors_applet->applet, DISPLAY_NOTIFICATIONS, notify, NULL); @@ -222,7 +222,7 @@ static void prefs_dialog_graph_size_changed(GtkSpinButton *button, PrefsDialog *prefs_dialog) { gint value; value = (gint)(gtk_spin_button_get_value(button)); - panel_applet_gconf_set_int(prefs_dialog->sensors_applet->applet, GRAPH_SIZE, value, NULL); + mate_panel_applet_mateconf_set_int(prefs_dialog->sensors_applet->applet, GRAPH_SIZE, value, NULL); /* notify change of number of samples */ sensors_applet_graph_size_changed(prefs_dialog->sensors_applet); @@ -472,7 +472,7 @@ void prefs_dialog_open(SensorsApplet *sensors_applet) { gtk_combo_box_append_text(prefs_dialog->display_mode_combo_box, _("graph only")); - display_mode = panel_applet_gconf_get_int(sensors_applet->applet, DISPLAY_MODE, NULL); + display_mode = mate_panel_applet_mateconf_get_int(sensors_applet->applet, DISPLAY_MODE, NULL); gtk_combo_box_set_active(prefs_dialog->display_mode_combo_box, display_mode); g_signal_connect(prefs_dialog->display_mode_combo_box, @@ -503,7 +503,7 @@ void prefs_dialog_open(SensorsApplet *sensors_applet) { gtk_combo_box_append_text(prefs_dialog->layout_mode_combo_box, _("beside labels / icons")); gtk_combo_box_append_text(prefs_dialog->layout_mode_combo_box, _("below labels / icons")); - gtk_combo_box_set_active(prefs_dialog->layout_mode_combo_box, panel_applet_gconf_get_int(sensors_applet->applet, LAYOUT_MODE, NULL)); + gtk_combo_box_set_active(prefs_dialog->layout_mode_combo_box, mate_panel_applet_mateconf_get_int(sensors_applet->applet, LAYOUT_MODE, NULL)); g_signal_connect(prefs_dialog->layout_mode_combo_box, "changed", @@ -528,7 +528,7 @@ void prefs_dialog_open(SensorsApplet *sensors_applet) { gtk_combo_box_append_text(prefs_dialog->temperature_scale_combo_box, _("Celsius")); gtk_combo_box_append_text(prefs_dialog->temperature_scale_combo_box, _("Fahrenheit")); - gtk_combo_box_set_active(prefs_dialog->temperature_scale_combo_box, panel_applet_gconf_get_int(sensors_applet->applet, TEMPERATURE_SCALE, NULL)); + gtk_combo_box_set_active(prefs_dialog->temperature_scale_combo_box, mate_panel_applet_mateconf_get_int(sensors_applet->applet, TEMPERATURE_SCALE, NULL)); g_signal_connect(prefs_dialog->temperature_scale_combo_box, "changed", @@ -543,7 +543,7 @@ void prefs_dialog_open(SensorsApplet *sensors_applet) { NULL); prefs_dialog->graph_size_adjust = g_object_new(GTK_TYPE_ADJUSTMENT, - "value", (gdouble)panel_applet_gconf_get_int(sensors_applet->applet, + "value", (gdouble)mate_panel_applet_mateconf_get_int(sensors_applet->applet, GRAPH_SIZE, NULL), "lower", 1.0, @@ -557,7 +557,7 @@ void prefs_dialog_open(SensorsApplet *sensors_applet) { "adjustment", prefs_dialog->graph_size_adjust, "climb-rate", 1.0, "digits", 0, - "value", (gdouble)panel_applet_gconf_get_int(sensors_applet->applet, + "value", (gdouble)mate_panel_applet_mateconf_get_int(sensors_applet->applet, GRAPH_SIZE, NULL), "width-chars", 4, @@ -604,7 +604,7 @@ void prefs_dialog_open(SensorsApplet *sensors_applet) { "adjustment", prefs_dialog->timeout_adjust, "climb-rate", 0.5, "digits", 1, - "value", (gdouble) panel_applet_gconf_get_int(sensors_applet->applet, TIMEOUT, NULL) / 1000.0, + "value", (gdouble) mate_panel_applet_mateconf_get_int(sensors_applet->applet, TIMEOUT, NULL) / 1000.0, "width-chars", 4, NULL); @@ -620,7 +620,7 @@ void prefs_dialog_open(SensorsApplet *sensors_applet) { G_CALLBACK(prefs_dialog_timeout_changed), prefs_dialog); -#ifdef HAVE_LIBNOTIFY +#ifdef HAVE_LIBMATENOTIFY header_text = g_markup_printf_escaped("<b>%s</b>", _("Notifications")); prefs_dialog->notifications_header = g_object_new(GTK_TYPE_LABEL, "use-markup", TRUE, @@ -635,7 +635,7 @@ void prefs_dialog_open(SensorsApplet *sensors_applet) { "label", _("Display _notifications"), NULL); gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(prefs_dialog->display_notifications), - panel_applet_gconf_get_bool(sensors_applet->applet, + mate_panel_applet_mateconf_get_bool(sensors_applet->applet, DISPLAY_NOTIFICATIONS, NULL)); g_signal_connect(prefs_dialog->display_notifications, @@ -665,7 +665,7 @@ void prefs_dialog_open(SensorsApplet *sensors_applet) { prefs_dialog->globals_table = g_object_new(GTK_TYPE_TABLE, "homogeneous", FALSE, "n-columns", 3, -#ifdef HAVE_LIBNOTIFY +#ifdef HAVE_LIBMATENOTIFY "n-rows", 9, #else "n-rows", 7, @@ -785,7 +785,7 @@ void prefs_dialog_open(SensorsApplet *sensors_applet) { 0); -#ifdef HAVE_LIBNOTIFY +#ifdef HAVE_LIBMATENOTIFY gtk_table_attach(prefs_dialog->globals_table, GTK_WIDGET(prefs_dialog->notifications_header), 0, 2, diff --git a/sensors-applet/prefs-dialog.h b/sensors-applet/prefs-dialog.h index 5d1270b..056c133 100644 --- a/sensors-applet/prefs-dialog.h +++ b/sensors-applet/prefs-dialog.h @@ -38,7 +38,7 @@ typedef struct { GtkLabel *timeout_label, *display_mode_label, *layout_mode_label, *temperature_scale_label, *graph_size_label, *update_header, *display_header; GtkAdjustment *timeout_adjust, *graph_size_adjust; -#ifdef HAVE_LIBNOTIFY +#ifdef HAVE_LIBMATENOTIFY GtkCheckButton *display_notifications; GtkLabel *notifications_header; #endif diff --git a/sensors-applet/sensor-config-dialog.c b/sensors-applet/sensor-config-dialog.c index bd55836..23107d7 100644 --- a/sensors-applet/sensor-config-dialog.c +++ b/sensors-applet/sensor-config-dialog.c @@ -20,7 +20,7 @@ #include "config.h" #endif /* HAVE_CONFIG_H */ -#include <gnome.h> +#include <mate.h> #include "sensor-config-dialog.h" #include "sensors-applet.h" diff --git a/sensors-applet/sensors-applet-mateconf.c b/sensors-applet/sensors-applet-mateconf.c new file mode 100644 index 0000000..43e9d0c --- /dev/null +++ b/sensors-applet/sensors-applet-mateconf.c @@ -0,0 +1,492 @@ +/* + * Copyright (C) 2005-2009 Alex Murray <[email protected]> + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif /* HAVE_CONFIG_H */ + +#include "sensors-applet.h" +#include "sensors-applet-mateconf.h" + +#define DEFAULT_TIMEOUT 2000 +#define DEFAULT_GRAPH_SIZE 42 + +static const gchar * const compatible_versions[] = { + PACKAGE_VERSION, /* always list current version */ + "2.2.6", + "2.2.5", + "2.2.4", + "2.2.3", + "2.2.2", +}; + +#define NUM_COMPATIBLE_VERSIONS G_N_ELEMENTS(compatible_versions) + +typedef enum { + SENSORS_APPLET_MATECONF_ERROR = 0, + SENSORS_APPLET_VERSION_ERROR, +} SensorsAppletMateConfError; + +static const gchar * const error_titles[] = { + N_("An error occurred loading the stored sensors data"), + N_("Incompatible sensors configuration found") +}; + +static const gchar * const error_messages[] = { + N_("An error has occurred when loading the stored sensors data. " + "The default values will be used to recover from this error."), + + N_("Unfortunately the previous configuration for MATE Sensors Applet " + "is not compatible with this version. The existing sensors data " + "will be overwritten with the default values for this new version.") +}; + +/* function to be called if an error occurs + when loading values from mateconf */ +static void sensors_applet_mateconf_error_occurred(SensorsAppletMateConfError error) { + GtkWidget *dialog; + gchar *markup; + + g_debug("Error occurred: %s", error_titles[error]); + markup = g_markup_printf_escaped("<span size=\"large\" weight=\"bold\">%s</span>\n\n%s", _(error_titles[error]), _(error_messages[error])); + + dialog = gtk_message_dialog_new_with_markup(NULL, /* no parent window */ + GTK_DIALOG_MODAL, + GTK_MESSAGE_WARNING, + GTK_BUTTONS_OK, + "%s", markup); + + g_free(markup); + + /* runs dialog as modal and doesn't return until user clicks + * button */ + gtk_dialog_run(GTK_DIALOG(dialog)); + gtk_widget_destroy(GTK_WIDGET(dialog)); +} + + +static void sensors_applet_mateconf_set_defaults(SensorsApplet *sensors_applet) { + mate_panel_applet_mateconf_set_int(sensors_applet->applet, DISPLAY_MODE, DISPLAY_ICON_WITH_VALUE, NULL); + mate_panel_applet_mateconf_set_int(sensors_applet->applet, LAYOUT_MODE, VALUE_BESIDE_LABEL, NULL); + mate_panel_applet_mateconf_set_int(sensors_applet->applet, TEMPERATURE_SCALE, CELSIUS, NULL); + mate_panel_applet_mateconf_set_int(sensors_applet->applet, TIMEOUT, DEFAULT_TIMEOUT, NULL); + mate_panel_applet_mateconf_set_int(sensors_applet->applet, GRAPH_SIZE, DEFAULT_GRAPH_SIZE, NULL); +#ifdef HAVE_LIBMATENOTIFY + mate_panel_applet_mateconf_set_bool(sensors_applet->applet, DISPLAY_NOTIFICATIONS, TRUE, NULL); +#endif + mate_panel_applet_mateconf_set_bool(sensors_applet->applet, IS_SETUP, FALSE, NULL); + +} + +/** + * Returns TRUE is old_version is one of the compatible versions + */ +static gboolean sensors_applet_mateconf_is_compatible(const gchar *old_version) { + guint i; + for (i = 0; i < NUM_COMPATIBLE_VERSIONS; i++) { + if (g_ascii_strcasecmp(old_version, compatible_versions[i]) == 0) { + return TRUE; + } + } + return FALSE; +} + + +void sensors_applet_mateconf_setup(SensorsApplet *sensors_applet) { + gboolean setup = FALSE; + gchar *old_version; + GError *error = NULL; + + /* need to convert old num_samples value to new GRAPH_SIZE + * parameter */ + gint num_samples; + if ((num_samples = mate_panel_applet_mateconf_get_int(sensors_applet->applet, + "num_samples", + NULL))) { + g_debug("Convering old num_samples value %d into graph_size", num_samples); + mate_panel_applet_mateconf_set_int(sensors_applet->applet, + GRAPH_SIZE, + (num_samples + GRAPH_FRAME_EXTRA_WIDTH), + NULL); + /* reset num_samples to zero */ + mate_panel_applet_mateconf_set_int(sensors_applet->applet, + "num_samples", + 0, + NULL); + + } + + /* convert old alarm_commands to high and low if exist */ + GSList *alarm_commands; + if ((alarm_commands = mate_panel_applet_mateconf_get_list(sensors_applet->applet, + "alarm_commands", + MATECONF_VALUE_STRING, + NULL))) { + + g_debug("Converting old alarm commands to new high and low commands"); + + mate_panel_applet_mateconf_set_list(sensors_applet->applet, + LOW_ALARM_COMMANDS, + MATECONF_VALUE_STRING, + alarm_commands, + NULL); + mate_panel_applet_mateconf_set_list(sensors_applet->applet, + HIGH_ALARM_COMMANDS, + MATECONF_VALUE_STRING, + alarm_commands, + NULL); + /* reset old list to null */ + mate_panel_applet_mateconf_set_list(sensors_applet->applet, + "alarm_commands", + MATECONF_VALUE_STRING, + NULL, + NULL); + g_slist_foreach(alarm_commands, (GFunc)g_free, NULL); + g_slist_free(alarm_commands); + + } + + setup = mate_panel_applet_mateconf_get_bool(sensors_applet->applet, + IS_SETUP, &error); + if (error) { + g_debug("Previous configuration not found: %s, setting up manually", error->message); + g_error_free(error); + error = NULL; + setup = FALSE; + } + + + if (setup) { + /* see if setup version matches */ + old_version = mate_panel_applet_mateconf_get_string(sensors_applet->applet, + SENSORS_APPLET_VERSION, + &error); + /* if versions don't match or there is no saved + * version string then need to overwrite old config */ + if (error) { + g_debug("Error getting old version string: %s", error->message); + g_error_free(error); + error = NULL; + old_version = NULL; + } + + if (old_version) { + if (sensors_applet_mateconf_is_compatible(old_version)) { + /* previously setup and versions match so use + * old values */ + g_debug("MateConf data is compatible. Trying to set up sensors from mateconf data"); + if (sensors_applet_mateconf_setup_sensors(sensors_applet)) { + g_debug("done setting up from mateconf"); + } else { + g_debug("Setting mateconf defaults only"); + sensors_applet_mateconf_set_defaults(sensors_applet); + } + g_free(old_version); + + return; + + + } + g_free(old_version); + + } + sensors_applet_notify(sensors_applet, MATECONF_READ_ERROR); + + + sensors_applet_mateconf_error_occurred(SENSORS_APPLET_VERSION_ERROR); + } + + /* use defaults */ + g_debug("Setting mateconf defaults only"); + sensors_applet_mateconf_set_defaults(sensors_applet); +} + +enum { + PATHS_INDEX = 0, + IDS_INDEX, + LABELS_INDEX, + INTERFACES_INDEX, + SENSOR_TYPES_INDEX, + ENABLES_INDEX, + LOW_VALUES_INDEX, + HIGH_VALUES_INDEX, + ALARM_ENABLES_INDEX, + LOW_ALARM_COMMANDS_INDEX, + HIGH_ALARM_COMMANDS_INDEX, + ALARM_TIMEOUTS_INDEX, + MULTIPLIERS_INDEX, + OFFSETS_INDEX, + ICON_TYPES_INDEX, + GRAPH_COLORS_INDEX, + NUM_KEYS +}; + +const gchar * const keys[NUM_KEYS] = { + PATHS, + IDS, + LABELS, + INTERFACES, + SENSOR_TYPES, + ENABLES, + LOW_VALUES, + HIGH_VALUES, + ALARM_ENABLES, + LOW_ALARM_COMMANDS, + HIGH_ALARM_COMMANDS, + ALARM_TIMEOUTS, + MULTIPLIERS, + OFFSETS, + ICON_TYPES, + GRAPH_COLORS, +}; + +/* MUST CORRESPOND TO ABOVE KEYS */ +const MateConfValueType key_types[NUM_KEYS] = { + MATECONF_VALUE_STRING, /* PATHS */ + MATECONF_VALUE_STRING, /* IDS, */ + MATECONF_VALUE_STRING, /* LABELS */ + MATECONF_VALUE_STRING, /* INTERFACES, */ + MATECONF_VALUE_INT, /* SENSOR_TYPES, */ + MATECONF_VALUE_BOOL, /* ENABLES, */ + MATECONF_VALUE_INT, /* LOW_VALUES, */ + MATECONF_VALUE_INT, /* HIGH_VALUES, */ + MATECONF_VALUE_BOOL, /* ALARM_ENABLES, */ + MATECONF_VALUE_STRING, /* LOW_ALARM_COMMANDS, */ + MATECONF_VALUE_STRING, /* HIGH_ALARM_COMMANDS, */ + MATECONF_VALUE_INT, /* ALARM_TIMEOUTS, */ + MATECONF_VALUE_INT, /* MULTIPLIERS, */ + MATECONF_VALUE_INT, /* OFFSETS, */ + MATECONF_VALUE_INT, /* ICON_TYPES, */ + MATECONF_VALUE_STRING /* GRAPH_COLORS, */ +}; + +void sensors_applet_mateconf_set_current_to_lists(GSList *current[], + GSList *lists[], + int len) { + for (len--; len >= 0; len--) { + current[len] = lists[len]; + } +} + +int sensors_applet_mateconf_current_not_null(GSList *current[], + int len) { + for (len--; len >= 0; len--) { + if (NULL == current[len]) { + return FALSE; + } + } + return TRUE; +} +void sensors_applet_mateconf_current_get_next(GSList *current[], + int len) { + for (len--; len >= 0; len--) { + current[len] = g_slist_next(current[len]); + } +} + +void sensors_applet_mateconf_free_lists(GSList *lists[], + int len) { + for (len--; len >= 0; len--) { + if (key_types[len] == MATECONF_VALUE_STRING) { + g_slist_foreach(lists[len], (GFunc)g_free, NULL); + } + g_slist_free(lists[len]); + } + +} + +/* gets called if are already setup so we don't have to manually go + through and find sensors etc again */ +gboolean sensors_applet_mateconf_setup_sensors(SensorsApplet *sensors_applet) { + /* everything gets stored except alarm timeout indexes, which + we set to -1, and visible which we set to false for all + parent nodes and true for all child nodes */ + int i; + GSList *lists[NUM_KEYS] = {NULL}; + + GSList *current[NUM_KEYS] = {NULL}; + + GError *error = NULL; + + for (i = 0; i < NUM_KEYS; i++) { + lists[i] = mate_panel_applet_mateconf_get_list(sensors_applet->applet, + keys[i], + key_types[i], + &error); + if (error || NULL == lists[i]) { + sensors_applet_notify(sensors_applet, MATECONF_READ_ERROR); + + sensors_applet_mateconf_error_occurred(SENSORS_APPLET_MATECONF_ERROR); + if (error) { + g_error_free(error); + } + return FALSE; + } + } + + for (sensors_applet_mateconf_set_current_to_lists(current, + lists, + NUM_KEYS); + sensors_applet_mateconf_current_not_null(current, + NUM_KEYS); + sensors_applet_mateconf_current_get_next(current, + NUM_KEYS)) { + + + g_debug("trying to add sensor from mateconf data: %s\n", (gchar *)(current[IDS_INDEX]->data)); + /* need to ensure correct order */ + sensors_applet_add_sensor(sensors_applet, + (gchar *)(current[PATHS_INDEX]->data), + (gchar *)(current[IDS_INDEX]->data), + (gchar *)(current[LABELS_INDEX]->data), + (gchar *)(current[INTERFACES_INDEX]->data), + GPOINTER_TO_UINT(current[SENSOR_TYPES_INDEX]->data), + GPOINTER_TO_INT(current[ENABLES_INDEX]->data), + (gdouble)(GPOINTER_TO_INT(current[LOW_VALUES_INDEX]->data) / 1000.0), + (gdouble)(GPOINTER_TO_INT(current[HIGH_VALUES_INDEX]->data) / 1000.0), + GPOINTER_TO_INT(current[ALARM_ENABLES_INDEX]->data), + (gchar *)(current[LOW_ALARM_COMMANDS_INDEX]->data), + (gchar *)(current[HIGH_ALARM_COMMANDS_INDEX]->data), + GPOINTER_TO_INT(current[ALARM_TIMEOUTS_INDEX]->data), + (gdouble)(GPOINTER_TO_INT(current[MULTIPLIERS_INDEX]->data) / 1000.0), + (gdouble)(GPOINTER_TO_INT(current[OFFSETS_INDEX]->data) / 1000.0), + (SensorType)GPOINTER_TO_UINT(current[ICON_TYPES_INDEX]->data), + (gchar *)(current[GRAPH_COLORS_INDEX]->data) + + ); + + } + sensors_applet_mateconf_free_lists(lists, + NUM_KEYS); + + return TRUE; +} + + +gboolean sensors_applet_mateconf_save_sensors(SensorsApplet *sensors_applet) { + /* write everything to mateconf except VISIBLE and + ALARM_TIMEOUT_INDEX */ + /* for stepping through GtkTreeStore data structure */ + GtkTreeIter interfaces_iter, sensors_iter; + gboolean not_end_of_interfaces = TRUE, not_end_of_sensors = TRUE; + + /* make sure all are initialized to null - since list of + * intializers is horter than number of element, rest get set + * to 0 (ie NULL) */ + GSList *lists[NUM_KEYS] = {NULL}; + int i; + gchar *current_path, *current_id, *current_label, *current_interface, + *current_low_alarm_command, *current_high_alarm_command, + *current_graph_color; + gboolean current_enable, current_alarm_enable; + gdouble current_low_value, current_high_value, current_multiplier, + current_offset; + guint current_alarm_timeout, current_sensor_type, + current_icon_type; + + GError *error = NULL; + + /* now step through the GtkTreeStore sensors to + find which sensors are enabled */ + for (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(sensors_applet->sensors), &interfaces_iter); not_end_of_interfaces; not_end_of_interfaces = gtk_tree_model_iter_next(GTK_TREE_MODEL(sensors_applet->sensors), &interfaces_iter)) { + // store a mateconf key for this interface + gtk_tree_model_get(GTK_TREE_MODEL(sensors_applet->sensors), + &interfaces_iter, + ID_COLUMN, ¤t_id, + -1); + + mate_panel_applet_mateconf_set_bool(sensors_applet->applet, current_id, TRUE, NULL); + g_free(current_id); + + /* reset sensors sentinel */ + not_end_of_sensors = TRUE; + + for (gtk_tree_model_iter_children(GTK_TREE_MODEL(sensors_applet->sensors), &sensors_iter, &interfaces_iter); not_end_of_sensors; not_end_of_sensors = gtk_tree_model_iter_next(GTK_TREE_MODEL(sensors_applet->sensors), &sensors_iter)) { + gtk_tree_model_get(GTK_TREE_MODEL(sensors_applet->sensors), + &sensors_iter, + PATH_COLUMN, ¤t_path, + ID_COLUMN, ¤t_id, + LABEL_COLUMN, ¤t_label, + INTERFACE_COLUMN, ¤t_interface, + SENSOR_TYPE_COLUMN, ¤t_sensor_type, + ENABLE_COLUMN, ¤t_enable, + LOW_VALUE_COLUMN, ¤t_low_value, + HIGH_VALUE_COLUMN, ¤t_high_value, + ALARM_ENABLE_COLUMN, ¤t_alarm_enable, + LOW_ALARM_COMMAND_COLUMN, ¤t_low_alarm_command, + HIGH_ALARM_COMMAND_COLUMN, ¤t_high_alarm_command, + ALARM_TIMEOUT_COLUMN, ¤t_alarm_timeout, + MULTIPLIER_COLUMN, ¤t_multiplier, + OFFSET_COLUMN, ¤t_offset, + ICON_TYPE_COLUMN, ¤t_icon_type, + GRAPH_COLOR_COLUMN, ¤t_graph_color, + -1); + + /* prepend values as this is faster then just + reverse list when finished */ + lists[PATHS_INDEX] = g_slist_prepend(lists[PATHS_INDEX], current_path); + lists[IDS_INDEX] = g_slist_prepend(lists[IDS_INDEX], current_id); + lists[LABELS_INDEX] = g_slist_prepend(lists[LABELS_INDEX], current_label); + lists[INTERFACES_INDEX] = g_slist_prepend(lists[INTERFACES_INDEX], current_interface); + lists[ENABLES_INDEX] = g_slist_prepend(lists[ENABLES_INDEX], GINT_TO_POINTER(current_enable)); + lists[LOW_VALUES_INDEX] = g_slist_prepend(lists[LOW_VALUES_INDEX], GINT_TO_POINTER((gint)(current_low_value * 1000))); + lists[HIGH_VALUES_INDEX] = g_slist_prepend(lists[HIGH_VALUES_INDEX], GINT_TO_POINTER((gint)(current_high_value * 1000))); + lists[ALARM_ENABLES_INDEX] = g_slist_prepend(lists[ALARM_ENABLES_INDEX], GINT_TO_POINTER(current_alarm_enable)); + lists[LOW_ALARM_COMMANDS_INDEX] = g_slist_prepend(lists[LOW_ALARM_COMMANDS_INDEX], current_low_alarm_command); + lists[HIGH_ALARM_COMMANDS_INDEX] = g_slist_prepend(lists[HIGH_ALARM_COMMANDS_INDEX], current_high_alarm_command); + lists[ALARM_TIMEOUTS_INDEX] = g_slist_prepend(lists[ALARM_TIMEOUTS_INDEX], GINT_TO_POINTER(current_alarm_timeout)); + lists[SENSOR_TYPES_INDEX] = g_slist_prepend(lists[SENSOR_TYPES_INDEX], GUINT_TO_POINTER(current_sensor_type)); + lists[MULTIPLIERS_INDEX] = g_slist_prepend(lists[MULTIPLIERS_INDEX], GINT_TO_POINTER((gint)(current_multiplier * 1000))); + lists[OFFSETS_INDEX] = g_slist_prepend(lists[OFFSETS_INDEX], GINT_TO_POINTER((gint)(current_offset * 1000))); + lists[ICON_TYPES_INDEX] = g_slist_prepend(lists[ICON_TYPES_INDEX], GUINT_TO_POINTER(current_icon_type)); + lists[GRAPH_COLORS_INDEX] = g_slist_prepend(lists[GRAPH_COLORS_INDEX], current_graph_color); + } + } + + /* keep lists in original order */ + for (i = 0; i < NUM_KEYS; i++) { + if (lists[i] != NULL) { + lists[i] = g_slist_reverse(lists[i]); + + mate_panel_applet_mateconf_set_list(sensors_applet->applet, + keys[i], + key_types[i], + lists[i], &error); + if (error) { + sensors_applet_notify(sensors_applet, MATECONF_WRITE_ERROR); + + g_error_free(error); + return FALSE; + } + } else { + g_debug("list %s is NULL", keys[i]); + } + + } + + sensors_applet_mateconf_free_lists(lists, + NUM_KEYS); + + /* store current version to identify config data */ + mate_panel_applet_mateconf_set_string(sensors_applet->applet, + SENSORS_APPLET_VERSION, + PACKAGE_VERSION, &error); + + return TRUE; +} + diff --git a/sensors-applet/sensors-applet-mateconf.h b/sensors-applet/sensors-applet-mateconf.h new file mode 100644 index 0000000..ce74efe --- /dev/null +++ b/sensors-applet/sensors-applet-mateconf.h @@ -0,0 +1,91 @@ +/* + * Copyright (C) 2005-2009 Alex Murray <[email protected]> + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef SENSORS_APPLET_MATECONF_H +#define SENSORS_APPLET_MATECONF_H + +#include "sensors-applet.h" +#include <mate-panel-applet-mateconf.h> + +#define FONT_SIZE "font-size" /* hidden mateconf option specifying font + * size in points */ + +#define HIDE_UNITS "hide-units" /* hidden mateconf option specifying not to + * show sensor units */ + +#define IS_SETUP "setup" /* have we actually set up this instance of + * the applet (gets set to true after + * closing prefences dialog) */ + +#define DISPLAY_MODE "display_mode" /* display icons or text labels?*/ + +#define LAYOUT_MODE "layout_mode" /* value beside or below label */ +#define TEMPERATURE_SCALE "temperature_scale" /* Kelvin, + Celsius or + Fahrenheit */ +#define DISPLAY_NOTIFICATIONS "display_notifications" /* whether to + * display + * notifications */ +#define TIMEOUT "timeout_delay" /* delay (in ms) between refreshes */ +#define GRAPH_SIZE "graph_size" /* the size of the graph in pixels - + * either width if horizontal, or + * height if vertical */ +#define PATHS "paths" /* full paths to filenames */ +#define IDS "ids" /* a list of the sensor device ids */ +#define INTERFACES "interfaces" /* a list of the sensor device + * interface for each sensor */ +#define LABELS "labels" /* user defined labels for each sensor */ +#define ENABLES "sensor_enables" /* list of booleans corresponding to + * the filenames of whether a sensor + * is enabled or not */ +#define LOW_VALUES "low_values" /* stored as ints (1000 * double + * value) for accuracy, since can + * only do ints easily */ +#define HIGH_VALUES "high_values" /* stored as ints (1000 * double + * value) for accuracy, since can + * only do ints easily */ +#define ALARM_ENABLES "alarm_enables" /* list of whether each sensor + * has its alarm enabled */ +#define LOW_ALARM_COMMANDS "low_alarm_commands" /* list of commands to execute + * when each alarm is + * activated */ +#define HIGH_ALARM_COMMANDS "high_alarm_commands" /* list of commands to execute + * when each alarm is + * activated */ + +#define ALARM_TIMEOUTS "alarm_timeouts" /* list of how often each + alarm should be sounded (in + seconds) */ + +#define SENSOR_TYPES "sensor_types" /* used to identify a sensor in a + list */ + +#define MULTIPLIERS "multipliers" +#define OFFSETS "offsets" +#define ICON_TYPES "icon_types" +#define GRAPH_COLORS "graph_colors" + +#define SENSORS_APPLET_VERSION "sensors_applet_version" /* version of + * config + * data */ + +gboolean sensors_applet_mateconf_save_sensors(SensorsApplet *sensors_applet); +gboolean sensors_applet_mateconf_setup_sensors(SensorsApplet *sensors_applet); +void sensors_applet_mateconf_setup(SensorsApplet *sensors_applet); + +#endif /* SENSORS_APPLET_MATECONF_H*/ diff --git a/sensors-applet/sensors-applet-plugins.c b/sensors-applet/sensors-applet-plugins.c index 7dfad78..6533903 100644 --- a/sensors-applet/sensors-applet-plugins.c +++ b/sensors-applet/sensors-applet-plugins.c @@ -27,7 +27,7 @@ #include "sensors-applet-plugins.h" #include "sensors-applet-sensor.h" -#define SENSORS_APPLET_USER_PLUGIN_DIR ".gnome2/sensors-applet/plugins" +#define SENSORS_APPLET_USER_PLUGIN_DIR ".mate2/sensors-applet/plugins" static void load_all_plugins(SensorsApplet *sensors_applet, const gchar *path) diff --git a/sensors-applet/sensors-applet.c b/sensors-applet/sensors-applet.c index 9486173..ebd0046 100644 --- a/sensors-applet/sensors-applet.c +++ b/sensors-applet/sensors-applet.c @@ -28,15 +28,15 @@ #include <unistd.h> #endif /* HAVE_UNISTD_H */ -#include <gnome.h> +#include <mate.h> #include <glib/gprintf.h> #include "sensors-applet.h" #include "active-sensor.h" -#include "sensors-applet-gconf.h" +#include "sensors-applet-mateconf.h" #include "sensors-applet-plugins.h" -#ifdef HAVE_LIBNOTIFY -#include "active-sensor-libnotify.h" +#ifdef HAVE_LIBMATENOTIFY +#include "active-sensor-libmatenotify.h" #define DEFAULT_NOTIFY_TIMEOUT 3000 #endif @@ -51,7 +51,7 @@ #define ROW_SPACING 0 /* callbacks for panel menu */ -static void prefs_cb(BonoboUIComponent *uic, +static void prefs_cb(MateComponentUIComponent *uic, gpointer *data, const gchar *verbname) { @@ -65,7 +65,7 @@ static void prefs_cb(BonoboUIComponent *uic, prefs_dialog_open(sensors_applet); } -static void about_cb(BonoboUIComponent *uic, +static void about_cb(MateComponentUIComponent *uic, gpointer data, const gchar *verbname) { SensorsApplet *sensors_applet; @@ -74,7 +74,7 @@ static void about_cb(BonoboUIComponent *uic, about_dialog_open(sensors_applet); } -static void help_cb(BonoboUIComponent *uic, +static void help_cb(MateComponentUIComponent *uic, gpointer data, const gchar *verbname) { @@ -120,8 +120,8 @@ static void destroy_cb(GtkWidget *widget, gpointer data) { return; } -static void change_background_cb(PanelApplet *applet, - PanelAppletBackgroundType type, +static void change_background_cb(MatePanelApplet *applet, + MatePanelAppletBackgroundType type, GdkColor *color, GdkPixmap *pixmap, gpointer *data) { @@ -159,8 +159,8 @@ static void change_background_cb(PanelApplet *applet, } } -static void change_orient_cb (PanelApplet *applet, - PanelAppletOrient orient, +static void change_orient_cb (MatePanelApplet *applet, + MatePanelAppletOrient orient, gpointer data) { SensorsApplet *sensors_applet; sensors_applet = (SensorsApplet *)data; @@ -168,18 +168,18 @@ static void change_orient_cb (PanelApplet *applet, sensors_applet_display_layout_changed(sensors_applet); } -static void size_allocate_cb(PanelApplet *applet, +static void size_allocate_cb(MatePanelApplet *applet, GtkAllocation *allocation, gpointer data) { SensorsApplet *sensors_applet; - PanelAppletOrient orient; + MatePanelAppletOrient orient; g_debug("size-allocate occurred"); sensors_applet = (SensorsApplet *)data; - orient = panel_applet_get_orient(sensors_applet->applet); + orient = mate_panel_applet_get_orient(sensors_applet->applet); - if ((orient == PANEL_APPLET_ORIENT_LEFT) || - (orient == PANEL_APPLET_ORIENT_RIGHT)) { + if ((orient == MATE_PANEL_APPLET_ORIENT_LEFT) || + (orient == MATE_PANEL_APPLET_ORIENT_RIGHT)) { if (sensors_applet->size == allocation->width) return; sensors_applet->size = allocation->width; @@ -212,7 +212,7 @@ static void style_set_cb(GtkWidget *widget, g_debug("set-style occurred"); - display_mode = panel_applet_gconf_get_int(sensors_applet->applet, + display_mode = mate_panel_applet_mateconf_get_int(sensors_applet->applet, DISPLAY_MODE, NULL); if (sensors_applet->sensors) { @@ -255,14 +255,14 @@ static void style_set_cb(GtkWidget *widget, } -static const BonoboUIVerb sensors_applet_menu_verbs[] = { - BONOBO_UI_UNSAFE_VERB("Preferences", prefs_cb), - BONOBO_UI_UNSAFE_VERB ("Help", help_cb), - BONOBO_UI_UNSAFE_VERB("About", about_cb), - BONOBO_UI_VERB_END +static const MateComponentUIVerb sensors_applet_menu_verbs[] = { + MATECOMPONENT_UI_UNSAFE_VERB("Preferences", prefs_cb), + MATECOMPONENT_UI_UNSAFE_VERB ("Help", help_cb), + MATECOMPONENT_UI_UNSAFE_VERB("About", about_cb), + MATECOMPONENT_UI_VERB_END }; -#ifdef HAVE_LIBNOTIFY +#ifdef HAVE_LIBMATENOTIFY static void notif_closed_cb(NotifyNotification *notification, SensorsApplet *sensors_applet) { @@ -270,12 +270,12 @@ static void notif_closed_cb(NotifyNotification *notification, sensors_applet->notification = NULL; } -#endif // HAVE_LIBNOTIFY +#endif // HAVE_LIBMATENOTIFY void sensors_applet_notify(SensorsApplet *sensors_applet, NotifType notif_type) { -#ifdef HAVE_LIBNOTIFY +#ifdef HAVE_LIBMATENOTIFY gchar *message; gchar *summary; GError *error = NULL; @@ -293,12 +293,12 @@ void sensors_applet_notify(SensorsApplet *sensors_applet, } switch (notif_type) { - case GCONF_READ_ERROR: + case MATECONF_READ_ERROR: summary = g_strdup_printf(_("Error restoring saved sensor configuration.")); message = g_strdup_printf(_("An error occurred while trying to restore the saved sensor configuration. The previous configuration has been lost and will need to be re-entered.")); break; - case GCONF_WRITE_ERROR: + case MATECONF_WRITE_ERROR: summary = g_strdup_printf(_("Error saving sensor configuration.")); message = g_strdup_printf(_("An error occurred while trying to save the current sensor configuration. ")); break; @@ -320,12 +320,12 @@ void sensors_applet_notify(SensorsApplet *sensors_applet, g_debug("Error showing notification: %s", error->message); g_error_free(error); } -#endif // HAVE_LIBNOTIFY +#endif // HAVE_LIBMATENOTIFY } void sensors_applet_notify_active_sensor(ActiveSensor *active_sensor, NotifType notif_type) { -#ifdef HAVE_LIBNOTIFY +#ifdef HAVE_LIBMATENOTIFY SensorsApplet *sensors_applet; GList *table_children; @@ -347,7 +347,7 @@ void sensors_applet_notify_active_sensor(ActiveSensor *active_sensor, NotifType sensors_applet = active_sensor->sensors_applet; - if (!panel_applet_gconf_get_bool(sensors_applet->applet, + if (!mate_panel_applet_mateconf_get_bool(sensors_applet->applet, DISPLAY_NOTIFICATIONS, NULL)) { g_debug("Wanted to display notification, but user has disabled them"); @@ -411,7 +411,7 @@ void sensors_applet_notify_active_sensor(ActiveSensor *active_sensor, NotifType case TEMP_SENSOR: unit_type_title = _("Temperature"); unit_type = _("temperature"); - temp_scale = (TemperatureScale)panel_applet_gconf_get_int(active_sensor->sensors_applet->applet, + temp_scale = (TemperatureScale)mate_panel_applet_mateconf_get_int(active_sensor->sensors_applet->applet, TEMPERATURE_SCALE, NULL); @@ -457,7 +457,7 @@ void sensors_applet_notify_active_sensor(ActiveSensor *active_sensor, NotifType case SENSOR_INTERFACE_ERROR: summary = g_strdup_printf(_("Error updating sensor %s"), sensor_label); message = g_strdup_printf(_("An error occurred while trying to update the value of the sensor %s located at %s."), sensor_label, sensor_path); - timeout_msecs = panel_applet_gconf_get_int(active_sensor->sensors_applet->applet, + timeout_msecs = mate_panel_applet_mateconf_get_int(active_sensor->sensors_applet->applet, TIMEOUT, NULL); @@ -467,7 +467,7 @@ void sensors_applet_notify_active_sensor(ActiveSensor *active_sensor, NotifType g_assert_not_reached(); } - active_sensor_libnotify_notify(active_sensor, + active_sensor_libmatenotify_notify(active_sensor, notif_type, summary, message, @@ -484,21 +484,21 @@ void sensors_applet_notify_active_sensor(ActiveSensor *active_sensor, NotifType void sensors_applet_notify_end(ActiveSensor *active_sensor, NotifType notif_type) { -#ifdef HAVE_LIBNOTIFY - active_sensor_libnotify_notify_end(active_sensor, notif_type); +#ifdef HAVE_LIBMATENOTIFY + active_sensor_libmatenotify_notify_end(active_sensor, notif_type); #endif } -#ifdef HAVE_LIBNOTIFY +#ifdef HAVE_LIBMATENOTIFY static void sensors_applet_notify_end_all_gfunc(ActiveSensor *active_sensor, gpointer data) { - active_sensor_libnotify_notify_end(active_sensor, LOW_ALARM); - active_sensor_libnotify_notify_end(active_sensor, HIGH_ALARM); + active_sensor_libmatenotify_notify_end(active_sensor, LOW_ALARM); + active_sensor_libmatenotify_notify_end(active_sensor, HIGH_ALARM); } #endif void sensors_applet_notify_end_all(SensorsApplet *sensors_applet) { -#ifdef HAVE_LIBNOTIFY +#ifdef HAVE_LIBMATENOTIFY g_list_foreach(sensors_applet->active_sensors, (GFunc)sensors_applet_notify_end_all_gfunc, NULL); @@ -599,14 +599,14 @@ static void sensors_applet_pack_display(SensorsApplet *sensors_applet) { /* otherwise can acess active_sensors without any worries */ num_active_sensors = g_list_length(sensors_applet->active_sensors); - display_mode = (DisplayMode)panel_applet_gconf_get_int(sensors_applet->applet, + display_mode = (DisplayMode)mate_panel_applet_mateconf_get_int(sensors_applet->applet, DISPLAY_MODE, NULL); - layout_mode = (LayoutMode)panel_applet_gconf_get_int(sensors_applet->applet, + layout_mode = (LayoutMode)mate_panel_applet_mateconf_get_int(sensors_applet->applet, LAYOUT_MODE, NULL); - horizontal = (((panel_applet_get_orient(sensors_applet->applet) == PANEL_APPLET_ORIENT_UP) || - (panel_applet_get_orient(sensors_applet->applet) == PANEL_APPLET_ORIENT_DOWN))); + horizontal = (((mate_panel_applet_get_orient(sensors_applet->applet) == MATE_PANEL_APPLET_ORIENT_UP) || + (mate_panel_applet_get_orient(sensors_applet->applet) == MATE_PANEL_APPLET_ORIENT_DOWN))); /* figure out num rows / cols by how high / wide sensors * labels / icons are and how much size we have to put them @@ -1302,13 +1302,13 @@ void sensors_applet_graph_size_changed(SensorsApplet *sensors_applet) { if (sensors_applet->active_sensors) { - graph_size = panel_applet_gconf_get_int(sensors_applet->applet, + graph_size = mate_panel_applet_mateconf_get_int(sensors_applet->applet, GRAPH_SIZE, NULL); - if (panel_applet_get_orient(sensors_applet->applet) == - PANEL_APPLET_ORIENT_UP || - panel_applet_get_orient(sensors_applet->applet) == - PANEL_APPLET_ORIENT_DOWN) { + if (mate_panel_applet_get_orient(sensors_applet->applet) == + MATE_PANEL_APPLET_ORIENT_UP || + mate_panel_applet_get_orient(sensors_applet->applet) == + MATE_PANEL_APPLET_ORIENT_DOWN) { /* is horizontal so set graph_size as width */ dimensions[0] = graph_size; dimensions[1] = sensors_applet->size; @@ -1388,16 +1388,16 @@ void sensors_applet_init(SensorsApplet *sensors_applet) { /* initialise size */ sensors_applet->size = DEFAULT_APPLET_SIZE; - panel_applet_set_flags(sensors_applet->applet, - PANEL_APPLET_EXPAND_MINOR); + mate_panel_applet_set_flags(sensors_applet->applet, + MATE_PANEL_APPLET_EXPAND_MINOR); g_signal_connect(sensors_applet->applet, "destroy", G_CALLBACK(destroy_cb), sensors_applet); - /* if not setup, write defaults to gconf */ - sensors_applet_gconf_setup(sensors_applet); + /* if not setup, write defaults to mateconf */ + sensors_applet_mateconf_setup(sensors_applet); /* now do any setup needed manually */ sensors_applet_plugins_load_all(sensors_applet); @@ -1413,7 +1413,7 @@ void sensors_applet_init(SensorsApplet *sensors_applet) { } /* only do menu and signal connections if sensors are found */ - panel_applet_setup_menu_from_file(sensors_applet->applet, + mate_panel_applet_setup_menu_from_file(sensors_applet->applet, DATADIR, SENSORS_APPLET_MENU_FILE, NULL, @@ -1441,7 +1441,7 @@ void sensors_applet_init(SensorsApplet *sensors_applet) { sensors_applet_update_active_sensors(sensors_applet); sensors_applet_pack_display(sensors_applet); - sensors_applet->timeout_id = g_timeout_add_seconds(panel_applet_gconf_get_int(sensors_applet->applet, TIMEOUT, NULL) / 1000, + sensors_applet->timeout_id = g_timeout_add_seconds(mate_panel_applet_mateconf_get_int(sensors_applet->applet, TIMEOUT, NULL) / 1000, (GSourceFunc)sensors_applet_update_active_sensors, sensors_applet); gtk_widget_show_all(GTK_WIDGET(sensors_applet->applet)); diff --git a/sensors-applet/sensors-applet.h b/sensors-applet/sensors-applet.h index ac56dc4..3aecb18 100644 --- a/sensors-applet/sensors-applet.h +++ b/sensors-applet/sensors-applet.h @@ -20,15 +20,15 @@ #define SENSORS_APPLET_H #include <gtk/gtk.h> -#include <panel-applet.h> +#include <mate-panel-applet.h> #include "sensors-applet-sensor.h" #ifdef HAVE_CONFIG_H #include "config.h" #endif /* HAVE_CONFIG_H */ -#ifdef HAVE_LIBNOTIFY -#include <libnotify/notify.h> +#ifdef HAVE_LIBMATENOTIFY +#include <libmatenotify/notify.h> #endif typedef struct _ActiveSensor ActiveSensor; @@ -60,7 +60,7 @@ static const gchar * const stock_icons[NUM_ICONS] = { /* enumeration used to identify columns in the GtkTreeStore data - * structure and to access specific gconf keys too. + * structure and to access specific mateconf keys too. */ enum { PATH_COLUMN = 0, @@ -110,8 +110,8 @@ typedef enum { LOW_ALARM = 0, HIGH_ALARM, SENSOR_INTERFACE_ERROR, - GCONF_READ_ERROR, - GCONF_WRITE_ERROR, + MATECONF_READ_ERROR, + MATECONF_WRITE_ERROR, NUM_NOTIFS } NotifType; @@ -120,7 +120,7 @@ typedef enum { struct _SensorsApplet { /* the actual applet for this instance */ - PanelApplet* applet; + MatePanelApplet* applet; gint size; GtkTreeStore *sensors; @@ -137,9 +137,9 @@ struct _SensorsApplet { * list of labels and sensor values into this container */ GtkWidget *table; GList *active_sensors; -#ifdef HAVE_LIBNOTIFY +#ifdef HAVE_LIBMATENOTIFY NotifyNotification *notification; -#endif // HAVE_LIBNOTIFY +#endif // HAVE_LIBMATENOTIFY }; |
