Fix configured icons and notify.
authorRoy Marples <roy@marples.name>
Mon, 24 May 2010 13:26:42 +0000 (13:26 +0000)
committerRoy Marples <roy@marples.name>
Mon, 24 May 2010 13:26:42 +0000 (13:26 +0000)
15 files changed:
configure
icons/16x16/Makefile
icons/16x16/Makefile.inc
icons/22x22/Makefile
icons/22x22/Makefile.inc
icons/24x24/Makefile
icons/24x24/Makefile.inc
icons/32x32/Makefile
icons/32x32/Makefile.inc
icons/48x48/Makefile
icons/48x48/Makefile.inc
icons/scalable/Makefile
icons/scalable/Makefile.inc
mk/icon.mk
src/dhcpcd-gtk/main.c

index 315e68a3c35510a3fc16f7ec6c3d8daa9695fdf2..fc16fce0bf4ef2abeefd5b2a389fa2fa4a1b628f 100755 (executable)
--- a/configure
+++ b/configure
@@ -228,7 +228,7 @@ echo "DBUS_LIBS=    $DBUS_LIBS" >>$CONFIG_MK
 
 UI=
 if [ "$WITH_GTK" = yes -o -z "$WITH_GTK" ]; then
-       PKG="gtk+-2.0"
+       PKG="dbus-1 gtk+-2.0"
        if [ "$NOTIFY" = yes ]; then
                PKG="$PKG${PKG:+ }libnotify"
                echo "NOTIFY=           -DNOTIFY" >>$CONFIG_MK
@@ -254,6 +254,7 @@ echo
 echo "   SYSCONFDIR =          $SYSCONFDIR"
 echo "   BINDIR =              $BINDIR"
 echo "   LIBDIR =              $LIBDIR"
+echo "   ICONDIR =             $ICONDIR"
 echo "   UI =                  $UI"
 echo
 
index 6c43e68ae51512d46682e33f8aa20ead6cab9f6f..7c5539326ddc7423dabe5f4a2196153c9b5cae9e 100644 (file)
@@ -1,4 +1,5 @@
 SUBDIR=        actions devices status
 
-MK=    ../../mk
-include ${MK}/subdir.mk
+TOPDIR=                ../..
+include ${TOPDIR}/config.mk
+include ${MKDIR}/subdir.mk
index 4ed1900ad4aa4636754156698c9b55c91110720f..7f57c00abc33b40786f4b70c26d596d059e4af8c 100644 (file)
@@ -6,5 +6,6 @@ VPATH+=         ${SRCDIR}/${CATEGORY}
 
 SIZE=          16
 
-MK=            ../../../mk
-include        ${MK}/icon.mk
+TOPDIR=                ../../..
+include ${TOPDIR}/config.mk
+include ${MKDIR}/icon.mk
index 6c43e68ae51512d46682e33f8aa20ead6cab9f6f..7c5539326ddc7423dabe5f4a2196153c9b5cae9e 100644 (file)
@@ -1,4 +1,5 @@
 SUBDIR=        actions devices status
 
-MK=    ../../mk
-include ${MK}/subdir.mk
+TOPDIR=                ../..
+include ${TOPDIR}/config.mk
+include ${MKDIR}/subdir.mk
index be5f286b66e6eafb0ac76aef4a48a19a6c6e660d..5a975b459d21d2f043c6d6503d6f97073e1b73cc 100644 (file)
@@ -6,5 +6,6 @@ VPATH+=         ${SRCDIR}/${CATEGORY}
 
 SIZE=          22
 
-MK=            ../../../mk
-include        ${MK}/icon.mk
+TOPDIR=         ../../..
+include ${TOPDIR}/config.mk
+include ${MKDIR}/icon.mk
index 6c43e68ae51512d46682e33f8aa20ead6cab9f6f..7c5539326ddc7423dabe5f4a2196153c9b5cae9e 100644 (file)
@@ -1,4 +1,5 @@
 SUBDIR=        actions devices status
 
-MK=    ../../mk
-include ${MK}/subdir.mk
+TOPDIR=                ../..
+include ${TOPDIR}/config.mk
+include ${MKDIR}/subdir.mk
index 1eb15b709084911c66113772ac72db1ad593ae50..2089aa104b41e5d074c94b190314994a7d0740e7 100644 (file)
@@ -6,5 +6,6 @@ VPATH+=         ${SRCDIR}/${CATEGORY}
 
 SIZE=          24
 
-MK=            ../../../mk
-include        ${MK}/icon.mk
+TOPDIR=         ../../..
+include ${TOPDIR}/config.mk
+include ${MKDIR}/icon.mk
index 6c43e68ae51512d46682e33f8aa20ead6cab9f6f..7c5539326ddc7423dabe5f4a2196153c9b5cae9e 100644 (file)
@@ -1,4 +1,5 @@
 SUBDIR=        actions devices status
 
-MK=    ../../mk
-include ${MK}/subdir.mk
+TOPDIR=                ../..
+include ${TOPDIR}/config.mk
+include ${MKDIR}/subdir.mk
index 0bb69de90f7401c7c3efc2ff63aafa1d80141195..cfd884766f0758ff1a4503dad563ec2b36c697e4 100644 (file)
@@ -6,5 +6,6 @@ VPATH+=         ${SRCDIR}/${CATEGORY}
 
 SIZE=          32
 
-MK=            ../../../mk
-include        ${MK}/icon.mk
+TOPDIR=         ../../..
+include ${TOPDIR}/config.mk
+include ${MKDIR}/icon.mk
index 6c43e68ae51512d46682e33f8aa20ead6cab9f6f..7c5539326ddc7423dabe5f4a2196153c9b5cae9e 100644 (file)
@@ -1,4 +1,5 @@
 SUBDIR=        actions devices status
 
-MK=    ../../mk
-include ${MK}/subdir.mk
+TOPDIR=                ../..
+include ${TOPDIR}/config.mk
+include ${MKDIR}/subdir.mk
index 669e6066c56b25d571e935cddaf4946ea7fe94ea..fd1c9a29b25d408570dd68d3d4d093ad3c398d8f 100644 (file)
@@ -6,5 +6,6 @@ VPATH+=         ${SRCDIR}/${CATEGORY}
 
 SIZE=          48
 
-MK=            ../../../mk
-include        ${MK}/icon.mk
+TOPDIR=         ../../..
+include ${TOPDIR}/config.mk
+include ${MKDIR}/icon.mk
index 6c43e68ae51512d46682e33f8aa20ead6cab9f6f..7c5539326ddc7423dabe5f4a2196153c9b5cae9e 100644 (file)
@@ -1,4 +1,5 @@
 SUBDIR=        actions devices status
 
-MK=    ../../mk
-include ${MK}/subdir.mk
+TOPDIR=                ../..
+include ${TOPDIR}/config.mk
+include ${MKDIR}/subdir.mk
index eb10495be72e7fc6f29aa5f970ac7a1b79a8d597..78ffc47c7768bb1af683b7ab3add10ce655930c3 100644 (file)
@@ -1,5 +1,6 @@
 SIZE=          scalable
 SIZEDIR=       scalable
 
-MK=            ../../../mk
-include        ${MK}/icon.mk
+TOPDIR=                ../../..
+include ${TOPDIR}/config.mk
+include ${MKDIR}/icon.mk
index 18dfa19eedaf9c3437526caddf1f97cf111cb786..01040375531f3b55789322c216295a1dd620de6c 100644 (file)
@@ -1,4 +1,4 @@
-include ${MK}/sys.mk
+include ${MKDIR}/sys.mk
 
 SIZEDIR?=      ${SIZE}x${SIZE}
 ICONDIR?=      ${PREFIX}/share/dhcpcd/icons
index 2754d5c901baf493a89f251272aec6da20a927fd..bd2a432a40096117897f0d0fa43cd5d112f7de0f 100644 (file)
@@ -176,15 +176,13 @@ notify_close(void)
 #endif
 }
 
+#ifdef NOTIFY
 static void
 notify_closed(void)
 {
-#ifdef NOTIFY
        nn = NULL;
-#endif
 }
 
-#ifdef NOTIFY
 static void
 notify(const char *title, const char *msg, const char *icon)
 {
@@ -412,7 +410,9 @@ main(int argc, char *argv[])
            _("Connecting to dhcpcd ..."));
        gtk_status_icon_set_visible(status_icon, true);
 
+#ifdef NOTIFY
        notify_init(PACKAGE);
+#endif
 
        g_message(_("Connecting ..."));
        con = dhcpcd_open(&error);