From 487239d3df7362f7f5ec5d4934a8672787f557e7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 16 Jan 2009 12:44:08 -0600 Subject: Adding in a return that was missing (though it's useless) --- libindicate/tests/indicate-and-crash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libindicate/tests/indicate-and-crash.c b/libindicate/tests/indicate-and-crash.c index 44be76e..5a50e30 100644 --- a/libindicate/tests/indicate-and-crash.c +++ b/libindicate/tests/indicate-and-crash.c @@ -2,7 +2,7 @@ #include #include "libindicate/indicator.h" -gboolean crashfunc (gpointer data) { *(int *)data = 5; } +gboolean crashfunc (gpointer data) { *(int *)data = 5; return FALSE;} int main (int argc, char ** argv) -- cgit v1.2.3 From 8f801277df211416ca9636b3d28ead43f9f50a35 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 16 Jan 2009 12:47:51 -0600 Subject: Moving the tests so that they can guarantee to build after the library builds as otherwise they end up getting built first. --- Makefile.am | 1 + configure.ac | 2 +- libindicate/Makefile.am | 2 -- libindicate/tests/Makefile.am | 38 ------------------------- libindicate/tests/indicate-alot.c | 24 ---------------- libindicate/tests/indicate-and-crash.c | 20 ------------- libindicate/tests/listen-and-print.c | 51 ---------------------------------- libindicate/tests/test.js | 6 ---- tests/Makefile.am | 38 +++++++++++++++++++++++++ tests/indicate-alot.c | 24 ++++++++++++++++ tests/indicate-and-crash.c | 20 +++++++++++++ tests/listen-and-print.c | 51 ++++++++++++++++++++++++++++++++++ tests/test.js | 6 ++++ 13 files changed, 141 insertions(+), 142 deletions(-) delete mode 100644 libindicate/tests/Makefile.am delete mode 100644 libindicate/tests/indicate-alot.c delete mode 100644 libindicate/tests/indicate-and-crash.c delete mode 100644 libindicate/tests/listen-and-print.c delete mode 100755 libindicate/tests/test.js create mode 100644 tests/Makefile.am create mode 100644 tests/indicate-alot.c create mode 100644 tests/indicate-and-crash.c create mode 100644 tests/listen-and-print.c create mode 100755 tests/test.js diff --git a/Makefile.am b/Makefile.am index 083ceff..555e6d5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,5 +2,6 @@ SUBDIRS = \ src \ libindicate \ + tests \ data \ po diff --git a/configure.ac b/configure.ac index cff6775..7fe6675 100644 --- a/configure.ac +++ b/configure.ac @@ -70,7 +70,7 @@ Makefile src/Makefile libindicate/Makefile libindicate/indicate.pc -libindicate/tests/Makefile +tests/Makefile data/Makefile data/icons/Makefile data/icons/16x16/Makefile diff --git a/libindicate/Makefile.am b/libindicate/Makefile.am index 53917b7..d2a0811 100644 --- a/libindicate/Makefile.am +++ b/libindicate/Makefile.am @@ -1,6 +1,4 @@ -SUBDIRS = tests - INCLUDES= \ -DG_LOG_DOMAIN=\"libindicate\" diff --git a/libindicate/tests/Makefile.am b/libindicate/tests/Makefile.am deleted file mode 100644 index 208da5b..0000000 --- a/libindicate/tests/Makefile.am +++ /dev/null @@ -1,38 +0,0 @@ - -noinst_PROGRAMS = \ - indicate-and-crash \ - indicate-alot \ - listen-and-print - -indicate_and_crash_SOURCES = \ - indicate-and-crash.c - -indicate_and_crash_CFLAGS = \ - -I $(srcdir)/../.. \ - $(LIBINDICATE_CFLAGS) - -indicate_and_crash_LDADD = \ - ../libindicate.la \ - $(LIBINDICATE_LIBS) - -indicate_alot_SOURCES = \ - indicate-alot.c - -indicate_alot_CFLAGS = \ - -I $(srcdir)/../.. \ - $(LIBINDICATE_CFLAGS) - -indicate_alot_LDADD = \ - ../libindicate.la \ - $(LIBINDICATE_LIBS) - -listen_and_print_SOURCES = \ - listen-and-print.c - -listen_and_print_CFLAGS = \ - -I $(srcdir)/../.. \ - $(LIBINDICATE_CFLAGS) - -listen_and_print_LDADD = \ - ../libindicate.la \ - $(LIBINDICATE_LIBS) diff --git a/libindicate/tests/indicate-alot.c b/libindicate/tests/indicate-alot.c deleted file mode 100644 index bebf726..0000000 --- a/libindicate/tests/indicate-alot.c +++ /dev/null @@ -1,24 +0,0 @@ - -#include -#include "libindicate/indicator.h" - -#define ALOT 30 - - -int -main (int argc, char ** argv) -{ - g_type_init(); - - IndicateIndicator * indicators[ALOT]; - int i; - - for (i = 0; i < ALOT; i++) { - indicators[i] = indicate_indicator_new(); - indicate_indicator_show(indicators[i]); - } - - g_main_loop_run(g_main_loop_new(NULL, FALSE)); - - return 0; -} diff --git a/libindicate/tests/indicate-and-crash.c b/libindicate/tests/indicate-and-crash.c deleted file mode 100644 index 5a50e30..0000000 --- a/libindicate/tests/indicate-and-crash.c +++ /dev/null @@ -1,20 +0,0 @@ - -#include -#include "libindicate/indicator.h" - -gboolean crashfunc (gpointer data) { *(int *)data = 5; return FALSE;} - -int -main (int argc, char ** argv) -{ - g_type_init(); - - IndicateIndicator * indicator = indicate_indicator_new(); - indicate_indicator_show(indicator); - - g_timeout_add_seconds(15, crashfunc, NULL); - - g_main_loop_run(g_main_loop_new(NULL, FALSE)); - - return 0; -} diff --git a/libindicate/tests/listen-and-print.c b/libindicate/tests/listen-and-print.c deleted file mode 100644 index 9ad2cc8..0000000 --- a/libindicate/tests/listen-and-print.c +++ /dev/null @@ -1,51 +0,0 @@ - -#include -#include "libindicate/listener.h" - -static void -indicator_added (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * type, gpointer data) -{ - g_debug("Indicator Added: %s %d %s", (gchar *)server, (guint)indicator, type); -} - -static void -indicator_removed (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * type, gpointer data) -{ - g_debug("Indicator Removed: %s %d %s", (gchar *)server, (guint)indicator, type); -} - -static void -indicator_modified (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * type, gchar * property, gpointer data) -{ - g_debug("Indicator Modified: %s %d %s %s", (gchar *)server, (guint)indicator, type, property); -} - -static void -server_added (IndicateListener * listener, IndicateListenerServer * server, gpointer data) -{ - g_debug("Indicator Server Added: %s", (gchar *)server); -} - -static void -server_removed (IndicateListener * listener, IndicateListenerServer * server, gpointer data) -{ - g_debug("Indicator Server Removed: %s", (gchar *)server); -} - -int -main (int argc, char ** argv) -{ - g_type_init(); - - IndicateListener * listener = indicate_listener_new(); - - g_signal_connect(listener, "indicator-added", G_CALLBACK(indicator_added), NULL); - g_signal_connect(listener, "indicator-removed", G_CALLBACK(indicator_removed), NULL); - g_signal_connect(listener, "indicator-modified", G_CALLBACK(indicator_modified), NULL); - g_signal_connect(listener, "server-added", G_CALLBACK(server_added), NULL); - g_signal_connect(listener, "server-removed", G_CALLBACK(server_removed), NULL); - - g_main_loop_run(g_main_loop_new(NULL, FALSE)); - - return 0; -} diff --git a/libindicate/tests/test.js b/libindicate/tests/test.js deleted file mode 100755 index 45b0d05..0000000 --- a/libindicate/tests/test.js +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/local/bin/seed -Seed.import_namespace("Indicate"); - -var indicator = new Indicate.Indicator(); - -indicator.show(); diff --git a/tests/Makefile.am b/tests/Makefile.am new file mode 100644 index 0000000..03ec716 --- /dev/null +++ b/tests/Makefile.am @@ -0,0 +1,38 @@ + +noinst_PROGRAMS = \ + indicate-and-crash \ + indicate-alot \ + listen-and-print + +indicate_and_crash_SOURCES = \ + indicate-and-crash.c + +indicate_and_crash_CFLAGS = \ + -I $(srcdir)/.. \ + $(LIBINDICATE_CFLAGS) + +indicate_and_crash_LDADD = \ + ../libindicate/libindicate.la \ + $(LIBINDICATE_LIBS) + +indicate_alot_SOURCES = \ + indicate-alot.c + +indicate_alot_CFLAGS = \ + -I $(srcdir)/.. \ + $(LIBINDICATE_CFLAGS) + +indicate_alot_LDADD = \ + ../libindicate/libindicate.la \ + $(LIBINDICATE_LIBS) + +listen_and_print_SOURCES = \ + listen-and-print.c + +listen_and_print_CFLAGS = \ + -I $(srcdir)/.. \ + $(LIBINDICATE_CFLAGS) + +listen_and_print_LDADD = \ + ../libindicate/libindicate.la \ + $(LIBINDICATE_LIBS) diff --git a/tests/indicate-alot.c b/tests/indicate-alot.c new file mode 100644 index 0000000..bebf726 --- /dev/null +++ b/tests/indicate-alot.c @@ -0,0 +1,24 @@ + +#include +#include "libindicate/indicator.h" + +#define ALOT 30 + + +int +main (int argc, char ** argv) +{ + g_type_init(); + + IndicateIndicator * indicators[ALOT]; + int i; + + for (i = 0; i < ALOT; i++) { + indicators[i] = indicate_indicator_new(); + indicate_indicator_show(indicators[i]); + } + + g_main_loop_run(g_main_loop_new(NULL, FALSE)); + + return 0; +} diff --git a/tests/indicate-and-crash.c b/tests/indicate-and-crash.c new file mode 100644 index 0000000..5a50e30 --- /dev/null +++ b/tests/indicate-and-crash.c @@ -0,0 +1,20 @@ + +#include +#include "libindicate/indicator.h" + +gboolean crashfunc (gpointer data) { *(int *)data = 5; return FALSE;} + +int +main (int argc, char ** argv) +{ + g_type_init(); + + IndicateIndicator * indicator = indicate_indicator_new(); + indicate_indicator_show(indicator); + + g_timeout_add_seconds(15, crashfunc, NULL); + + g_main_loop_run(g_main_loop_new(NULL, FALSE)); + + return 0; +} diff --git a/tests/listen-and-print.c b/tests/listen-and-print.c new file mode 100644 index 0000000..9ad2cc8 --- /dev/null +++ b/tests/listen-and-print.c @@ -0,0 +1,51 @@ + +#include +#include "libindicate/listener.h" + +static void +indicator_added (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * type, gpointer data) +{ + g_debug("Indicator Added: %s %d %s", (gchar *)server, (guint)indicator, type); +} + +static void +indicator_removed (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * type, gpointer data) +{ + g_debug("Indicator Removed: %s %d %s", (gchar *)server, (guint)indicator, type); +} + +static void +indicator_modified (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * type, gchar * property, gpointer data) +{ + g_debug("Indicator Modified: %s %d %s %s", (gchar *)server, (guint)indicator, type, property); +} + +static void +server_added (IndicateListener * listener, IndicateListenerServer * server, gpointer data) +{ + g_debug("Indicator Server Added: %s", (gchar *)server); +} + +static void +server_removed (IndicateListener * listener, IndicateListenerServer * server, gpointer data) +{ + g_debug("Indicator Server Removed: %s", (gchar *)server); +} + +int +main (int argc, char ** argv) +{ + g_type_init(); + + IndicateListener * listener = indicate_listener_new(); + + g_signal_connect(listener, "indicator-added", G_CALLBACK(indicator_added), NULL); + g_signal_connect(listener, "indicator-removed", G_CALLBACK(indicator_removed), NULL); + g_signal_connect(listener, "indicator-modified", G_CALLBACK(indicator_modified), NULL); + g_signal_connect(listener, "server-added", G_CALLBACK(server_added), NULL); + g_signal_connect(listener, "server-removed", G_CALLBACK(server_removed), NULL); + + g_main_loop_run(g_main_loop_new(NULL, FALSE)); + + return 0; +} diff --git a/tests/test.js b/tests/test.js new file mode 100755 index 0000000..45b0d05 --- /dev/null +++ b/tests/test.js @@ -0,0 +1,6 @@ +#!/usr/local/bin/seed +Seed.import_namespace("Indicate"); + +var indicator = new Indicate.Indicator(); + +indicator.show(); -- cgit v1.2.3 From 28c26d84159776fb75707923ca76a67d59a317ee Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 16 Jan 2009 12:54:01 -0600 Subject: Adding in the libindicate lib. --- debian/changelog | 6 ++++++ debian/control | 23 +++++++++++++++++++++-- debian/indicator-applet.install | 4 ++++ debian/libindicate-dev.install | 5 +++++ debian/libindicate.install | 1 + 5 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 debian/indicator-applet.install create mode 100644 debian/libindicate-dev.install create mode 100644 debian/libindicate.install diff --git a/debian/changelog b/debian/changelog index 11b1a13..7831cd7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-applet (0.1~ppa9) intrepid; urgency=low + + * Adding in the libindicate lib. + + -- Ted Gould Fri, 16 Jan 2009 12:41:32 -0600 + indicator-applet (0.1~ppa8) intrepid; urgency=low * Moving the indicator directory cross-packages. diff --git a/debian/control b/debian/control index 946cce9..011c05c 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,26 @@ Build-Depends: debhelper (>= 5.0), Standards-Version: 3.8.0 Package: indicator-applet -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-panel +Architecture: all +Depends: ${shlibs:Depends}, + ${misc:Depends}, + gnome-panel Description: Applet for the GNOME panel providing various indicators for display to users. + +Package: libindicate +Section: libs +Architecture: all +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: A library used to indicate. + +Package: libindicate-dev +Section: libdevel +Architecture: all +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libindicate (= ${binary:Version}), + libdbus-glib-1-dev (>= 0.76), + libgtk2.0-dev (>= 2.12.0) +Description: Development files. diff --git a/debian/indicator-applet.install b/debian/indicator-applet.install new file mode 100644 index 0000000..d5b122e --- /dev/null +++ b/debian/indicator-applet.install @@ -0,0 +1,4 @@ +debian/tmp/etc +debian/tmp/usr/lib/bonobo +debian/tmp/usr/lib/indicator-applet +debian/tmp/usr/share diff --git a/debian/libindicate-dev.install b/debian/libindicate-dev.install new file mode 100644 index 0000000..76e63d7 --- /dev/null +++ b/debian/libindicate-dev.install @@ -0,0 +1,5 @@ +debian/tmp/usr/include/ usr/ +debian/tmp/usr/lib/pkgconfig usr/lib/ +debian/tmp/usr/lib/libindicate.a usr/lib/ +debian/tmp/usr/lib/libindicate.la usr/lib/ +debian/tmp/usr/lib/libindicate.so usr/lib/ diff --git a/debian/libindicate.install b/debian/libindicate.install new file mode 100644 index 0000000..c31fb18 --- /dev/null +++ b/debian/libindicate.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libindicate.so.* usr/lib -- cgit v1.2.3 From 913c9d2d48268bd5d9b2dff72f5430e4f8a513a8 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 16 Jan 2009 12:58:34 -0600 Subject: Making it so the lib only uses glib (which it does) --- configure.ac | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 7fe6675..dc408e3 100644 --- a/configure.ac +++ b/configure.ac @@ -46,7 +46,9 @@ AC_SUBST(APPLET_LIBS) AC_PATH_PROG(GCONFTOOL, gconftool-2) AM_GCONF_SOURCE_2 -PKG_CHECK_MODULES(LIBINDICATE, gtk+-2.0 >= $GTK_REQUIRED_VERSION +GLIB_REQUIRED_VERSION=2.18 + +PKG_CHECK_MODULES(LIBINDICATE, glib-2.0 >= $GLIB_REQUIRED_VERSION dbus-glib-1 >= $DBUS_REQUIRED_VERSION) AC_SUBST(LIBINDICATE_CFLAGS) AC_SUBST(LIBINDICATE_LIBS) -- cgit v1.2.3 From 872812ad907aa58e02204885b12c533c2c1bec58 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 16 Jan 2009 13:03:26 -0600 Subject: Changing the build targets, now I understand the difference between 'any' and 'all' --- debian/control | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index 011c05c..e5d5cc3 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 5.0), Standards-Version: 3.8.0 Package: indicator-applet -Architecture: all +Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-panel @@ -22,14 +22,14 @@ Description: Applet for the GNOME panel providing various indicators for Package: libindicate Section: libs -Architecture: all +Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: A library used to indicate. Package: libindicate-dev Section: libdevel -Architecture: all +Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libindicate (= ${binary:Version}), -- cgit v1.2.3