[network-manager-netbook/MplPanelClient: 6/7] Remove copied+pasted nbtk-gtk-light-switch.[ch] and depend on nbtk-gtk.



commit d8a914182eadce770f8274fd6b57d3e93c23d591
Author: Tambet Ingo <tambet gmail com>
Date:   Wed Sep 9 10:01:57 2009 +0300

    Remove copied+pasted nbtk-gtk-light-switch.[ch] and depend on nbtk-gtk.

 configure.in                |    2 +-
 src/Makefile.am             |    2 -
 src/nbtk-gtk-light-switch.c |  412 -------------------------------------------
 src/nbtk-gtk-light-switch.h |   62 -------
 src/nmn-applet.c            |    2 +-
 5 files changed, 2 insertions(+), 478 deletions(-)
---
diff --git a/configure.in b/configure.in
index cd7ec38..012b918 100644
--- a/configure.in
+++ b/configure.in
@@ -20,7 +20,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
 IT_PROG_INTLTOOL([0.35.0])
 AM_GLIB_GNU_GETTEXT
 
-PKG_CHECK_MODULES(NMN, dbus-glib-1 >= 0.75 gtk+-2.0 gconf-2.0 gnome-keyring-1 libnm-util libnm_glib mobile-broadband-provider-info moblin-panel-gtk)
+PKG_CHECK_MODULES(NMN, dbus-glib-1 >= 0.75 gtk+-2.0 gconf-2.0 gnome-keyring-1 libnm-util libnm_glib mobile-broadband-provider-info moblin-panel-gtk nbtk-gtk-1.0)
 
 GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
 AC_SUBST(GLIB_GENMARSHAL)
diff --git a/src/Makefile.am b/src/Makefile.am
index 983d222..a65f40f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -66,8 +66,6 @@ network_manager_netbook_SOURCES = \
 	utils.h \
 	wireless-dialog.c \
 	wireless-dialog.h \
-	nbtk-gtk-light-switch.c \
-	nbtk-gtk-light-switch.h \
 	$(NULL)
 
 uidir = $(datadir)/network-manager-netbook
diff --git a/src/nmn-applet.c b/src/nmn-applet.c
index d87134a..8042d79 100644
--- a/src/nmn-applet.c
+++ b/src/nmn-applet.c
@@ -19,7 +19,7 @@
 
 #include <dbus/dbus-glib-lowlevel.h>
 #include <moblin-panel/mpl-panel-gtk.h>
-#include <nbtk-gtk-light-switch.h>
+#include <nbtk/nbtk-gtk-light-switch.h>
 #include "nmn-applet.h"
 #include "nmn-nm-data.h"
 #include "nmn-status-icon.h"



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]