[gnome-applets/wip/muktupavels/cleanup: 5/17] build: always build timer applet
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-applets/wip/muktupavels/cleanup: 5/17] build: always build timer applet
- Date: Tue, 24 Mar 2020 15:21:33 +0000 (UTC)
commit bb02f0c946fe1dfa853fcbf4796f05a198d545f0
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Tue Mar 24 16:46:50 2020 +0200
build: always build timer applet
Makefile.am | 5 +----
battstat/src/battstat_applet.c | 6 ------
configure.ac | 19 +++----------------
gweather/src/gweather-applet.c | 7 -------
4 files changed, 4 insertions(+), 33 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 309056810..96313e93c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,10 +16,6 @@ if HAVE_TRACKER_SEARCH_BAR
tracker_search_bar_SUBDIR = tracker-search-bar
endif
-if BUILD_TIMER
-timer_SUBDIR = timer
-endif
-
always_built_SUBDIRS = \
charpick \
brightness \
@@ -32,6 +28,7 @@ always_built_SUBDIRS = \
multiload \
netspeed \
sticky-notes \
+ timer \
trash \
window-buttons \
window-picker \
diff --git a/battstat/src/battstat_applet.c b/battstat/src/battstat_applet.c
index 2aeaa9548..379cca001 100644
--- a/battstat/src/battstat_applet.c
+++ b/battstat/src/battstat_applet.c
@@ -38,9 +38,7 @@
#include <panel-applet.h>
-#ifdef HAVE_LIBNOTIFY
#include <libnotify/notify.h>
-#endif
#include "battstat.h"
#include "pixmaps.h"
@@ -374,7 +372,6 @@ get_remaining (BatteryStatus *info)
static gboolean
battery_full_notify (GtkWidget *applet)
{
-#ifdef HAVE_LIBNOTIFY
GError *error = NULL;
GdkPixbuf *icon;
gboolean result;
@@ -406,9 +403,6 @@ battery_full_notify (GtkWidget *applet)
g_object_unref (G_OBJECT (n));
return result;
-#else
- return FALSE;
-#endif
}
/* Show a dialog notifying the user that their battery is done charging.
diff --git a/configure.ac b/configure.ac
index 1cd99ba20..71102ba5b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -137,15 +137,8 @@ dnl -- check for libwnck (required) -------------------------------------------
PKG_CHECK_MODULES(LIBWNCK, libwnck-3.0 >= $LIBWNCK_REQUIRED,,
AC_MSG_ERROR([libwnck is required to build gnome-applets.], 1))
-dnl -- check for libnotify (optional) -----------------------------------------
-LIBNOTIFY_CFLAGS=
-LIBNOTIFY_LIBS=
-PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED,
- HAVE_LIBNOTIFY="yes", HAVE_LIBNOTIFY="no")
-
-if test "x$HAVE_LIBNOTIFY" = "xyes"; then
- AC_DEFINE(HAVE_LIBNOTIFY, 1, [libnotify available])
-fi
+dnl -- check for libnotify (required) -----------------------------------------
+PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED)
PKG_CHECK_MODULES([CPUFREQ_SELECTOR], [
gio-unix-2.0 >= $GIO_REQUIRED)
@@ -421,12 +414,6 @@ fi
AM_CONDITIONAL(HAVE_TRACKER_SEARCH_BAR, test "$have_tracker_search_bar" = "yes")
-dnl ***************************************************************************
-dnl *** timer applet specific checks ***
-dnl ***************************************************************************
-
-AM_CONDITIONAL(BUILD_TIMER, test "x$HAVE_LIBNOTIFY" = "xyes")
-
dnl ***************************************************************************
dnl *** Check if IPv6 is available ***
dnl ***************************************************************************
@@ -655,7 +642,7 @@ echo " mini-commander ................: always"
echo " multiload .....................: always"
echo " netspeed ......................: always"
echo " sticky-notes ..................: always"
-echo " timer .........................: $HAVE_LIBNOTIFY"
+echo " timer .........................: always"
echo " tracker-search-bar ............: $have_tracker_search_bar"
echo " trash .........................: always"
echo " window-buttons ................: always"
diff --git a/gweather/src/gweather-applet.c b/gweather/src/gweather-applet.c
index 560f83c41..c2ea3e34e 100644
--- a/gweather/src/gweather-applet.c
+++ b/gweather/src/gweather-applet.c
@@ -30,10 +30,7 @@
#include <gdk/gdkkeysyms.h>
-#ifdef HAVE_LIBNOTIFY
#include <libnotify/notify.h>
-#include <libnotify/notification.h>
-#endif
#include "gweather-pref.h"
#include "gweather-dialog.h"
@@ -476,9 +473,7 @@ static void
update_finish (GWeatherInfo *info, gpointer data)
{
static int gw_fault_counter = 0;
-#ifdef HAVE_LIBNOTIFY
char *message, *detail;
-#endif
GWeatherApplet *gw_applet = (GWeatherApplet *)data;
gint nxtSunEvent;
const gchar *icon_name;
@@ -526,7 +521,6 @@ update_finish (GWeatherInfo *info, gpointer data)
/* update applet */
place_widgets(gw_applet);
-#ifdef HAVE_LIBNOTIFY
if (g_settings_get_boolean (gw_applet->applet_settings, "show-notifications"))
{
NotifyNotification *n;
@@ -578,7 +572,6 @@ update_finish (GWeatherInfo *info, gpointer data)
g_free (detail);
}
}
-#endif
}
else
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]