From c8c7cf84e9f2ff43f0b6016f9622bdfed527d300 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Wed, 15 Jun 2011 16:17:57 +0100 Subject: Update autotools configuration Do not use deprecated macros Use new libtool syntax --- Makefile.am | 1 + configure.ac | 44 +++++++++++++++++++++----------------------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/Makefile.am b/Makefile.am index c955c6a..cdd5b8d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,4 @@ +ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} SUBDIRS = \ libindicator \ diff --git a/configure.ac b/configure.ac index b3c570f..c932b6a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,28 +1,32 @@ +AC_INIT([libindicator], + [0.3.22], + [http://bugs.launchpad.net/libindicator], + [libindicator], + [http://launchpad.net/libindicator]) -AC_INIT(libindicator, 0.3.22, ted@canonical.com) +AC_PREREQ([2.64]) -AC_PREREQ(2.53) +AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_AUX_DIR([build-aux]) + +AM_INIT_AUTOMAKE([1.11]) -AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(libindicator, 0.3.22) +AM_MAINTAINER_MODE([enable]) -AM_MAINTAINER_MODE -m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES]) +AM_SILENT_RULES([yes])] -AC_ISC_POSIX +# Check for programs AC_PROG_CC AM_PROG_CC_C_O -AC_STDC_HEADERS -AC_PROG_LIBTOOL -AC_PATH_PROG([GLIB_MKENUMS], [glib-mkenums]) +# Initialize libtool +LT_PREREQ([2.2]) +LT_INIT +AC_PATH_PROG([GLIB_MKENUMS], [glib-mkenums]) AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal]) -AC_SUBST(VERSION) -AC_CONFIG_MACRO_DIR([m4]) - -m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) AC_ARG_ENABLE([deprecations], [AS_HELP_STRING([--enable-deprecations], @@ -49,14 +53,10 @@ AC_ARG_WITH([gtk], AS_IF([test "x$with_gtk" = x3], [PKG_CHECK_MODULES(LIBINDICATOR, gtk+-3.0 >= $GTK3_REQUIRED_VERSION gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION) - AC_SUBST(LIBINDICATOR_CFLAGS) - AC_SUBST(LIBINDICATOR_LIBS) ], [test "x$with_gtk" = x2], [PKG_CHECK_MODULES(LIBINDICATOR, gtk+-2.0 >= $GTK_REQUIRED_VERSION gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION) - AC_SUBST(LIBINDICATOR_CFLAGS) - AC_SUBST(LIBINDICATOR_LIBS) ], [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])] ) @@ -100,9 +100,6 @@ EXPANDED_SYSCONFDIR=`eval echo $SYSCONFDIR_TMP` prefix=$old_prefix AC_SUBST(EXPANDED_SYSCONFDIR) -dnl Save flags to aclocal -ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" - AC_DEFINE_PATH(PREFIX, "${prefix}", [prefix directory]) AC_DEFINE_PATH(SYSCONFDIR, "${sysconfdir}", [system configuration dir]) AC_DEFINE_PATH(LIBDIR, "${libdir}", [system configuration dir]) @@ -111,7 +108,7 @@ AC_DEFINE_PATH(LIBDIR, "${libdir}", [system configuration dir]) # Debug symbols ######################### AC_ARG_ENABLE([debug], - AC_HELP_STRING([--enable-debug], [build with debug symbols]),, + AS_HELP_STRING([--enable-debug],[build with debug symbols]),, [enable_debug=no]) if test "x$enable_debug" = "xyes"; then @@ -125,7 +122,7 @@ AM_CONDITIONAL(ENABLE_DEBUG, test "$enable_debug" = "yes") # Files ########################### -AC_OUTPUT([ +AC_CONFIG_FILES([ Makefile libindicator/Makefile libindicator/indicator.pc @@ -133,6 +130,7 @@ libindicator/indicator3.pc tests/Makefile tools/Makefile ]) +AC_OUTPUT ########################### # Results -- cgit v1.2.3 From 9adf0b15626d60b307b38c93872f125cf229aa19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Wed, 15 Jun 2011 16:18:37 +0100 Subject: configure.ac: Generate xz tarballs with pax format by default --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index c932b6a..9da73a2 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,7 @@ AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) -AM_INIT_AUTOMAKE([1.11]) +AM_INIT_AUTOMAKE([1.11 -Wall tar-pax no-dist-gzip dist-xz]) AM_MAINTAINER_MODE([enable]) -- cgit v1.2.3 From 8881229ab3af6dfd5a23f33357c0ef466aa7fd85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Sat, 2 Jul 2011 04:13:05 +0200 Subject: Merging "scroll" and "scroll-entry" into the "entry-scrolled" signal API change to merge the duplication of signals, as defined in the blueprint desktop-dx-o-indicators-review --- libindicator/indicator-object-marshal.list | 1 - libindicator/indicator-object.c | 27 ++++----------------------- libindicator/indicator-object.h | 10 ++++------ 3 files changed, 8 insertions(+), 30 deletions(-) diff --git a/libindicator/indicator-object-marshal.list b/libindicator/indicator-object-marshal.list index 73f1fac..4896ac4 100644 --- a/libindicator/indicator-object-marshal.list +++ b/libindicator/indicator-object-marshal.list @@ -1,5 +1,4 @@ VOID: POINTER, UINT, UINT -VOID: UINT, ENUM VOID: POINTER, UINT, ENUM VOID: POINTER, UINT VOID: POINTER, BOOLEAN diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c index a061215..a91251c 100644 --- a/libindicator/indicator-object.c +++ b/libindicator/indicator-object.c @@ -59,8 +59,7 @@ enum { ENTRY_ADDED, ENTRY_REMOVED, ENTRY_MOVED, - SCROLL, - SCROLL_ENTRY, + ENTRY_SCROLLED, MENU_SHOW, SHOW_NOW_CHANGED, ACCESSIBLE_DESC_UPDATE, @@ -151,26 +150,8 @@ indicator_object_class_init (IndicatorObjectClass *klass) _indicator_object_marshal_VOID__POINTER_UINT_UINT, G_TYPE_NONE, 3, G_TYPE_POINTER, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_NONE); - /** - IndicatorObject::scroll: - @arg0: The #IndicatorObject object - @arg1: The delta of the scroll event - @arg2: The orientation of the scroll event. - - When the indicator receives a mouse scroll wheel event - from the user, this signal is emitted. - */ - signals[SCROLL] = g_signal_new (INDICATOR_OBJECT_SIGNAL_SCROLL, - G_TYPE_FROM_CLASS(klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (IndicatorObjectClass, scroll), - NULL, NULL, - _indicator_object_marshal_VOID__UINT_ENUM, - G_TYPE_NONE, 2, G_TYPE_UINT, - INDICATOR_OBJECT_TYPE_SCROLL_DIRECTION); - /** - IndicatorObject::scroll-entry: + IndicatorObject::entry-scrolled: @arg0: The #IndicatorObject object @arg1: A pointer to the #IndicatorObjectEntry that receives the scroll event. @@ -180,10 +161,10 @@ indicator_object_class_init (IndicatorObjectClass *klass) When the indicator receives a mouse scroll wheel event from the user, this signal is emitted. */ - signals[SCROLL_ENTRY] = g_signal_new (INDICATOR_OBJECT_SIGNAL_SCROLL_ENTRY, + signals[ENTRY_SCROLLED] = g_signal_new (INDICATOR_OBJECT_SIGNAL_ENTRY_SCROLLED, G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (IndicatorObjectClass, scroll_entry), + G_STRUCT_OFFSET (IndicatorObjectClass, entry_scrolled), NULL, NULL, _indicator_object_marshal_VOID__POINTER_UINT_ENUM, G_TYPE_NONE, 3, G_TYPE_POINTER, G_TYPE_UINT, diff --git a/libindicator/indicator-object.h b/libindicator/indicator-object.h index aa15c79..5faeff5 100644 --- a/libindicator/indicator-object.h +++ b/libindicator/indicator-object.h @@ -49,10 +49,8 @@ typedef enum #define INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED_ID (g_signal_lookup(INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED, INDICATOR_OBJECT_TYPE)) #define INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED "entry-moved" #define INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED_ID (g_signal_lookup(INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED, INDICATOR_OBJECT_TYPE)) -#define INDICATOR_OBJECT_SIGNAL_SCROLL "scroll" -#define INDICATOR_OBJECT_SIGNAL_SCROLL_ID (g_signal_lookup(INDICATOR_OBJECT_SIGNAL_SCROLL, INDICATOR_OBJECT_TYPE)) -#define INDICATOR_OBJECT_SIGNAL_SCROLL_ENTRY "scroll-entry" -#define INDICATOR_OBJECT_SIGNAL_SCROLL_ENTRY_ID (g_signal_lookup(#define INDICATOR_OBJECT_SIGNAL_SCROLL_ENTRY, INDICATOR_OBJECT_TYPE)) +#define INDICATOR_OBJECT_SIGNAL_ENTRY_SCROLLED "entry-scrolled" +#define INDICATOR_OBJECT_SIGNAL_ENTRY_SCROLLED_ID (g_signal_lookup(INDICATOR_OBJECT_SIGNAL_ENTRY_SCROLLED, INDICATOR_OBJECT_TYPE)) #define INDICATOR_OBJECT_SIGNAL_MENU_SHOW "menu-show" #define INDICATOR_OBJECT_SIGNAL_MENU_SHOW_ID (g_signal_lookup(INDICATOR_OBJECT_SIGNAL_MENU_SHOW, INDICATOR_OBJECT_TYPE)) #define INDICATOR_OBJECT_SIGNAL_SHOW_NOW_CHANGED "show-now-changed" @@ -96,6 +94,7 @@ typedef struct _IndicatorObjectEntry IndicatorObjectEntry; @entry_removed: Slot for #IndicatorObject::entry-removed @entry_moved: Slot for #IndicatorObject::entry-moved @menu_show: Slot for #IndicatorObject::menu-show + @entry_scrolled: Slot for #IndicatorObject::entry-scrolled @show_now_changed: Slot for #IndicatorObject::show-now-changed @accessible_desc_update: Slot for #IndicatorObject::accessible-desc-update */ @@ -119,10 +118,9 @@ struct _IndicatorObjectClass { void (*entry_added) (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_data); void (*entry_removed) (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_data); void (*entry_moved) (IndicatorObject * io, IndicatorObjectEntry * entry, guint old_pos, guint new_pos, gpointer user_data); - void (*scroll) (IndicatorObject * io, gint delta, IndicatorScrollDirection direction); + void (*entry_scrolled) (IndicatorObject * io, IndicatorObjectEntry * entry, gint delta, IndicatorScrollDirection direction); void (*menu_show) (IndicatorObject * io, IndicatorObjectEntry * entry, guint timestamp, gpointer user_data); void (*show_now_changed) (IndicatorObject * io, IndicatorObjectEntry * entry, gboolean show_now_state, gpointer user_data); - void (*scroll_entry) (IndicatorObject * io, IndicatorObjectEntry * entry, gint delta, IndicatorScrollDirection direction); void (*accessible_desc_update) (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_data); /* Reserved */ -- cgit v1.2.3 From f3dc285322d67289770bdc38427a3b48895a335e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 5 Jul 2011 14:58:15 -0500 Subject: Adding another level of .in for the pc files. --- configure.ac | 4 ++-- libindicator/Makefile.am | 7 +++++-- libindicator/indicator.pc.in | 17 ----------------- libindicator/indicator.pc.in.in | 17 +++++++++++++++++ libindicator/indicator3.pc.in | 17 ----------------- libindicator/indicator3.pc.in.in | 17 +++++++++++++++++ 6 files changed, 41 insertions(+), 38 deletions(-) delete mode 100644 libindicator/indicator.pc.in create mode 100644 libindicator/indicator.pc.in.in delete mode 100644 libindicator/indicator3.pc.in create mode 100644 libindicator/indicator3.pc.in.in diff --git a/configure.ac b/configure.ac index c35802e..535807b 100644 --- a/configure.ac +++ b/configure.ac @@ -125,8 +125,8 @@ AM_CONDITIONAL(ENABLE_DEBUG, test "$enable_debug" = "yes") AC_CONFIG_FILES([ Makefile libindicator/Makefile -libindicator/indicator.pc -libindicator/indicator3.pc +libindicator/indicator.pc.in +libindicator/indicator3.pc.in tests/Makefile tools/Makefile ]) diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am index d63f841..bb60d5c 100644 --- a/libindicator/Makefile.am +++ b/libindicator/Makefile.am @@ -10,8 +10,11 @@ BUILT_SOURCES = indicator-object-enum-types.h indicator-object-enum-types.c CLEANFILES = DISTCLEANFILES = EXTRA_DIST = \ - indicator3.pc.in \ - indicator.pc.in + indicator3.pc.in.in \ + indicator.pc.in.in + +%.pc: %.pc.in + cp $< $@ include $(top_srcdir)/Makefile.am.marshal diff --git a/libindicator/indicator.pc.in b/libindicator/indicator.pc.in deleted file mode 100644 index 4e9b177..0000000 --- a/libindicator/indicator.pc.in +++ /dev/null @@ -1,17 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -bindir=@bindir@ -includedir=@includedir@ - -indicatordir=${libdir}/indicators/5/ -iconsdir=@datarootdir@/@PACKAGE@/icons/ - -Cflags: -I${includedir}/libindicator-0.3 -Requires: gtk+-2.0 -Libs: -lindicator - -Name: libindicator -Description: libindicator. -Version: @VERSION@ - diff --git a/libindicator/indicator.pc.in.in b/libindicator/indicator.pc.in.in new file mode 100644 index 0000000..4e9b177 --- /dev/null +++ b/libindicator/indicator.pc.in.in @@ -0,0 +1,17 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +bindir=@bindir@ +includedir=@includedir@ + +indicatordir=${libdir}/indicators/5/ +iconsdir=@datarootdir@/@PACKAGE@/icons/ + +Cflags: -I${includedir}/libindicator-0.3 +Requires: gtk+-2.0 +Libs: -lindicator + +Name: libindicator +Description: libindicator. +Version: @VERSION@ + diff --git a/libindicator/indicator3.pc.in b/libindicator/indicator3.pc.in deleted file mode 100644 index 9fa0eac..0000000 --- a/libindicator/indicator3.pc.in +++ /dev/null @@ -1,17 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -bindir=@bindir@ -includedir=@includedir@ - -indicatordir=${libdir}/indicators3/2/ -iconsdir=@datarootdir@/@PACKAGE@/icons/ - -Cflags: -I${includedir}/libindicator-0.3 -Requires: gtk+-3.0 -Libs: -lindicator3 - -Name: libindicator3 -Description: libindicator3. -Version: @VERSION@ - diff --git a/libindicator/indicator3.pc.in.in b/libindicator/indicator3.pc.in.in new file mode 100644 index 0000000..9fa0eac --- /dev/null +++ b/libindicator/indicator3.pc.in.in @@ -0,0 +1,17 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +bindir=@bindir@ +includedir=@includedir@ + +indicatordir=${libdir}/indicators3/2/ +iconsdir=@datarootdir@/@PACKAGE@/icons/ + +Cflags: -I${includedir}/libindicator-0.3 +Requires: gtk+-3.0 +Libs: -lindicator3 + +Name: libindicator3 +Description: libindicator3. +Version: @VERSION@ + -- cgit v1.2.3 From 746cf4ec825feda7b16ea32fad82d2901c9791d3 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 5 Jul 2011 15:05:49 -0500 Subject: Making the API and ABI versions variables --- libindicator/Makefile.am | 12 +++++++++--- libindicator/indicator.pc.in.in | 4 ++-- libindicator/indicator3.pc.in.in | 4 ++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am index bb60d5c..1646023 100644 --- a/libindicator/Makefile.am +++ b/libindicator/Makefile.am @@ -13,12 +13,18 @@ EXTRA_DIST = \ indicator3.pc.in.in \ indicator.pc.in.in +INDICATOR_ABI_VERSION = 6 +INDICATOR_API_VERSION = 4 + %.pc: %.pc.in - cp $< $@ + sed \ + -e "s|\@indicator_api_version\@|$(INDICATOR_API_VERSION)|" \ + -e "s|\@indicator_abi_version\@|$(INDICATOR_ABI_VERSION)|" \ + $< > $@ include $(top_srcdir)/Makefile.am.marshal -libindicatorincludedir=$(includedir)/libindicator$(VER)-0.3/libindicator +libindicatorincludedir=$(includedir)/libindicator$(VER)-0.$(INDICATOR_API_VERSION)/libindicator indicator_headers = \ indicator.h \ @@ -54,7 +60,7 @@ libindicator_la_LIBADD = \ $(LIBINDICATOR_LIBS) libindicator_la_LDFLAGS = \ - -version-info 3:0:0 \ + -version-info $(INDICATOR_ABI_VERSION):0:0 \ -no-undefined \ -export-symbols-regex "^[^_].*" diff --git a/libindicator/indicator.pc.in.in b/libindicator/indicator.pc.in.in index 4e9b177..df4d6c8 100644 --- a/libindicator/indicator.pc.in.in +++ b/libindicator/indicator.pc.in.in @@ -4,10 +4,10 @@ libdir=@libdir@ bindir=@bindir@ includedir=@includedir@ -indicatordir=${libdir}/indicators/5/ +indicatordir=${libdir}/indicators/@indicator_abi_version@ iconsdir=@datarootdir@/@PACKAGE@/icons/ -Cflags: -I${includedir}/libindicator-0.3 +Cflags: -I${includedir}/libindicator-0.@indicator_api_version@ Requires: gtk+-2.0 Libs: -lindicator diff --git a/libindicator/indicator3.pc.in.in b/libindicator/indicator3.pc.in.in index 9fa0eac..1f34567 100644 --- a/libindicator/indicator3.pc.in.in +++ b/libindicator/indicator3.pc.in.in @@ -4,10 +4,10 @@ libdir=@libdir@ bindir=@bindir@ includedir=@includedir@ -indicatordir=${libdir}/indicators3/2/ +indicatordir=${libdir}/indicators3/@indicator_abi_version@/ iconsdir=@datarootdir@/@PACKAGE@/icons/ -Cflags: -I${includedir}/libindicator-0.3 +Cflags: -I${includedir}/libindicator-0.@indicator_api_version@ Requires: gtk+-3.0 Libs: -lindicator3 -- cgit v1.2.3 From 7797504facc6bb176c07b692abfbb7eadc76b5a6 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 5 Jul 2011 16:13:05 -0500 Subject: Adding the naming hint to the entry structure --- libindicator/indicator-object.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libindicator/indicator-object.h b/libindicator/indicator-object.h index 5faeff5..be7d43e 100644 --- a/libindicator/indicator-object.h +++ b/libindicator/indicator-object.h @@ -150,6 +150,8 @@ struct _IndicatorObject { @menu: The menu to be added to the menubar @accessible_desc: The accessible description of the indicator + @name_hint: A name to describe the indicator being placed to allow + the caller to be more aware of the individual entries. @reserved1: Reserved for future use @reserved2: Reserved for future use @@ -161,6 +163,7 @@ struct _IndicatorObjectEntry { GtkImage * image; GtkMenu * menu; const gchar * accessible_desc; + const gchar * name_hint; void (*reserved1) (void); void (*reserved2) (void); -- cgit v1.2.3 From 26c580fe6b0196d9bfb1eb136af7ae07eae017d8 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 5 Jul 2011 16:15:14 -0500 Subject: Adding a get name hint function as well. --- libindicator/indicator-object.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libindicator/indicator-object.h b/libindicator/indicator-object.h index be7d43e..a285949 100644 --- a/libindicator/indicator-object.h +++ b/libindicator/indicator-object.h @@ -77,6 +77,8 @@ typedef struct _IndicatorObjectEntry IndicatorObjectEntry; object. @get_accessible_desc: Gets the accessible descriptionfor this object. + @get_name_hint: Gets the hint of the type of indicator that this + is for the caller. @get_entries: Gets all of the entires for this object returning a #GList of #IndicatorObjectEntries. The list should be under the ownership of the caller but the entires will @@ -106,6 +108,7 @@ struct _IndicatorObjectClass { GtkImage * (*get_image) (IndicatorObject * io); GtkMenu * (*get_menu) (IndicatorObject * io); const gchar * (*get_accessible_desc) (IndicatorObject * io); + const gchar * (*get_name_hint) (IndicatorObject * io); GList * (*get_entries) (IndicatorObject * io); guint (*get_location) (IndicatorObject * io, IndicatorObjectEntry * entry); -- cgit v1.2.3 From f837b4b6102108a10bc897bdc1484882b5747316 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 5 Jul 2011 16:18:56 -0500 Subject: Clearing our local name_hint and ensuring we fill it if a function is provided. --- libindicator/indicator-object.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c index a91251c..2fe8dd1 100644 --- a/libindicator/indicator-object.c +++ b/libindicator/indicator-object.c @@ -240,6 +240,7 @@ indicator_object_init (IndicatorObject *self) self->priv->entry.label = NULL; self->priv->entry.image = NULL; self->priv->entry.accessible_desc = NULL; + self->priv->entry.name_hint = NULL; self->priv->gotten_entries = FALSE; @@ -435,6 +436,10 @@ get_entries_default (IndicatorObject * io) g_warning("IndicatorObject class does not have an accessible description."); } + if (class->get_name_hint) { + priv->entry.name_hint = class->get_name_hint(io); + } + priv->gotten_entries = TRUE; } -- cgit v1.2.3 From f5575b53091bee7985efb3c88bcc1d6fe34edefa Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 5 Jul 2011 22:27:48 -0500 Subject: Changing the pkgconfig file version to include the API version --- configure.ac | 4 ++-- libindicator/Makefile.am | 6 +++--- libindicator/indicator-0.4.pc.in.in | 17 +++++++++++++++++ libindicator/indicator.pc.in.in | 17 ----------------- libindicator/indicator3-0.4.pc.in.in | 17 +++++++++++++++++ libindicator/indicator3.pc.in.in | 17 ----------------- 6 files changed, 39 insertions(+), 39 deletions(-) create mode 100644 libindicator/indicator-0.4.pc.in.in delete mode 100644 libindicator/indicator.pc.in.in create mode 100644 libindicator/indicator3-0.4.pc.in.in delete mode 100644 libindicator/indicator3.pc.in.in diff --git a/configure.ac b/configure.ac index 535807b..7d17d0b 100644 --- a/configure.ac +++ b/configure.ac @@ -125,8 +125,8 @@ AM_CONDITIONAL(ENABLE_DEBUG, test "$enable_debug" = "yes") AC_CONFIG_FILES([ Makefile libindicator/Makefile -libindicator/indicator.pc.in -libindicator/indicator3.pc.in +libindicator/indicator-0.4.pc.in +libindicator/indicator3-0.4.pc.in tests/Makefile tools/Makefile ]) diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am index 1646023..53c0058 100644 --- a/libindicator/Makefile.am +++ b/libindicator/Makefile.am @@ -10,8 +10,8 @@ BUILT_SOURCES = indicator-object-enum-types.h indicator-object-enum-types.c CLEANFILES = DISTCLEANFILES = EXTRA_DIST = \ - indicator3.pc.in.in \ - indicator.pc.in.in + indicator3-0.$(INDICATOR_API_VERSION).pc.in.in \ + indicator-0.$(INDICATOR_API_VERSION).pc.in.in INDICATOR_ABI_VERSION = 6 INDICATOR_API_VERSION = 4 @@ -75,7 +75,7 @@ libindicator3_la_CFLAGS = $(libindicator_la_CFLAGS) libindicator3_la_LIBADD = $(libindicator_la_LIBADD) libindicator3_la_LDFLAGS = $(libindicator_la_LDFLAGS) -pkgconfig_DATA = indicator$(VER).pc +pkgconfig_DATA = indicator$(VER)-0.$(INDICATOR_API_VERSION).pc pkgconfigdir = $(libdir)/pkgconfig glib_marshal_list = indicator-object-marshal.list diff --git a/libindicator/indicator-0.4.pc.in.in b/libindicator/indicator-0.4.pc.in.in new file mode 100644 index 0000000..df4d6c8 --- /dev/null +++ b/libindicator/indicator-0.4.pc.in.in @@ -0,0 +1,17 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +bindir=@bindir@ +includedir=@includedir@ + +indicatordir=${libdir}/indicators/@indicator_abi_version@ +iconsdir=@datarootdir@/@PACKAGE@/icons/ + +Cflags: -I${includedir}/libindicator-0.@indicator_api_version@ +Requires: gtk+-2.0 +Libs: -lindicator + +Name: libindicator +Description: libindicator. +Version: @VERSION@ + diff --git a/libindicator/indicator.pc.in.in b/libindicator/indicator.pc.in.in deleted file mode 100644 index df4d6c8..0000000 --- a/libindicator/indicator.pc.in.in +++ /dev/null @@ -1,17 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -bindir=@bindir@ -includedir=@includedir@ - -indicatordir=${libdir}/indicators/@indicator_abi_version@ -iconsdir=@datarootdir@/@PACKAGE@/icons/ - -Cflags: -I${includedir}/libindicator-0.@indicator_api_version@ -Requires: gtk+-2.0 -Libs: -lindicator - -Name: libindicator -Description: libindicator. -Version: @VERSION@ - diff --git a/libindicator/indicator3-0.4.pc.in.in b/libindicator/indicator3-0.4.pc.in.in new file mode 100644 index 0000000..1f34567 --- /dev/null +++ b/libindicator/indicator3-0.4.pc.in.in @@ -0,0 +1,17 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +bindir=@bindir@ +includedir=@includedir@ + +indicatordir=${libdir}/indicators3/@indicator_abi_version@/ +iconsdir=@datarootdir@/@PACKAGE@/icons/ + +Cflags: -I${includedir}/libindicator-0.@indicator_api_version@ +Requires: gtk+-3.0 +Libs: -lindicator3 + +Name: libindicator3 +Description: libindicator3. +Version: @VERSION@ + diff --git a/libindicator/indicator3.pc.in.in b/libindicator/indicator3.pc.in.in deleted file mode 100644 index 1f34567..0000000 --- a/libindicator/indicator3.pc.in.in +++ /dev/null @@ -1,17 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -bindir=@bindir@ -includedir=@includedir@ - -indicatordir=${libdir}/indicators3/@indicator_abi_version@/ -iconsdir=@datarootdir@/@PACKAGE@/icons/ - -Cflags: -I${includedir}/libindicator-0.@indicator_api_version@ -Requires: gtk+-3.0 -Libs: -lindicator3 - -Name: libindicator3 -Description: libindicator3. -Version: @VERSION@ - -- cgit v1.2.3 From 173c8a74b0a8191c9b70cf8c7486032710f8bf74 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 5 Jul 2011 22:29:32 -0500 Subject: Setting default GTK version to 3 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 7d17d0b..c951db5 100644 --- a/configure.ac +++ b/configure.ac @@ -49,7 +49,7 @@ AC_ARG_WITH([gtk], [AS_HELP_STRING([--with-gtk], [Which version of gtk to use @<:@default=2@:>@])], [], - [with_gtk=2]) + [with_gtk=3]) AS_IF([test "x$with_gtk" = x3], [PKG_CHECK_MODULES(LIBINDICATOR, gtk+-3.0 >= $GTK3_REQUIRED_VERSION gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION) -- cgit v1.2.3 From 2d3893c354ea2d39d18b9e3524e640d671508f90 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 6 Jul 2011 16:11:29 -0500 Subject: Adding license info to [ch] files --- tests/dummy-indicator-blank.c | 22 ++++++++++++++++++++++ tests/dummy-indicator-null.c | 22 ++++++++++++++++++++++ tests/dummy-indicator-signaler.c | 22 ++++++++++++++++++++++ tests/dummy-indicator-simple.c | 22 ++++++++++++++++++++++ tests/service-manager-connect-service.c | 22 ++++++++++++++++++++++ tests/service-manager-connect.c | 22 ++++++++++++++++++++++ tests/service-manager-no-connect.c | 22 ++++++++++++++++++++++ tests/service-manager-nostart-connect.c | 22 ++++++++++++++++++++++ tests/service-shutdown-timeout.c | 22 ++++++++++++++++++++++ tests/service-version-bad-service.c | 22 ++++++++++++++++++++++ tests/service-version-good-service.c | 22 ++++++++++++++++++++++ tests/service-version-manager.c | 22 ++++++++++++++++++++++ .../service-version-multiwatch-manager-impolite.c | 22 ++++++++++++++++++++++ tests/service-version-multiwatch-manager.c | 22 ++++++++++++++++++++++ tests/service-version-multiwatch-service.c | 22 ++++++++++++++++++++++ tests/service-version-values.h | 22 ++++++++++++++++++++++ tests/test-desktop-shortcuts.c | 22 ++++++++++++++++++++++ tests/test-loader.c | 22 ++++++++++++++++++++++ 18 files changed, 396 insertions(+) diff --git a/tests/dummy-indicator-blank.c b/tests/dummy-indicator-blank.c index 5cfe0f0..874284b 100644 --- a/tests/dummy-indicator-blank.c +++ b/tests/dummy-indicator-blank.c @@ -1,3 +1,25 @@ +/* +Test for libindicator + +Copyright 2009 Canonical Ltd. + +Authors: + Ted Gould + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +version 3.0 as published by the Free Software Foundation. + +This library 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 version 3.0 for more details. + +You should have received a copy of the GNU General Public +License along with this library. If not, see +. +*/ + #include "libindicator/indicator.h" diff --git a/tests/dummy-indicator-null.c b/tests/dummy-indicator-null.c index 169196c..8aec668 100644 --- a/tests/dummy-indicator-null.c +++ b/tests/dummy-indicator-null.c @@ -1,3 +1,25 @@ +/* +Test for libindicator + +Copyright 2009 Canonical Ltd. + +Authors: + Ted Gould + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +version 3.0 as published by the Free Software Foundation. + +This library 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 version 3.0 for more details. + +You should have received a copy of the GNU General Public +License along with this library. If not, see +. +*/ + #include #include diff --git a/tests/dummy-indicator-signaler.c b/tests/dummy-indicator-signaler.c index dcb2560..00eee3b 100644 --- a/tests/dummy-indicator-signaler.c +++ b/tests/dummy-indicator-signaler.c @@ -1,3 +1,25 @@ +/* +Test for libindicator + +Copyright 2009 Canonical Ltd. + +Authors: + Ted Gould + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +version 3.0 as published by the Free Software Foundation. + +This library 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 version 3.0 for more details. + +You should have received a copy of the GNU General Public +License along with this library. If not, see +. +*/ + #include #include diff --git a/tests/dummy-indicator-simple.c b/tests/dummy-indicator-simple.c index 70937ba..1aab711 100644 --- a/tests/dummy-indicator-simple.c +++ b/tests/dummy-indicator-simple.c @@ -1,3 +1,25 @@ +/* +Test for libindicator + +Copyright 2009 Canonical Ltd. + +Authors: + Ted Gould + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +version 3.0 as published by the Free Software Foundation. + +This library 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 version 3.0 for more details. + +You should have received a copy of the GNU General Public +License along with this library. If not, see +. +*/ + #include #include diff --git a/tests/service-manager-connect-service.c b/tests/service-manager-connect-service.c index d60e414..7f57f96 100644 --- a/tests/service-manager-connect-service.c +++ b/tests/service-manager-connect-service.c @@ -1,3 +1,25 @@ +/* +Test for libindicator + +Copyright 2009 Canonical Ltd. + +Authors: + Ted Gould + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +version 3.0 as published by the Free Software Foundation. + +This library 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 version 3.0 for more details. + +You should have received a copy of the GNU General Public +License along with this library. If not, see +. +*/ + #include #include "libindicator/indicator-service.h" diff --git a/tests/service-manager-connect.c b/tests/service-manager-connect.c index 91d2bad..5e7684f 100644 --- a/tests/service-manager-connect.c +++ b/tests/service-manager-connect.c @@ -1,3 +1,25 @@ +/* +Test for libindicator + +Copyright 2009 Canonical Ltd. + +Authors: + Ted Gould + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +version 3.0 as published by the Free Software Foundation. + +This library 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 version 3.0 for more details. + +You should have received a copy of the GNU General Public +License along with this library. If not, see +. +*/ + #include #include "libindicator/indicator-service-manager.h" diff --git a/tests/service-manager-no-connect.c b/tests/service-manager-no-connect.c index 1c32eb2..fab0607 100644 --- a/tests/service-manager-no-connect.c +++ b/tests/service-manager-no-connect.c @@ -1,3 +1,25 @@ +/* +Test for libindicator + +Copyright 2009 Canonical Ltd. + +Authors: + Ted Gould + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +version 3.0 as published by the Free Software Foundation. + +This library 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 version 3.0 for more details. + +You should have received a copy of the GNU General Public +License along with this library. If not, see +. +*/ + #include #include "libindicator/indicator-service-manager.h" diff --git a/tests/service-manager-nostart-connect.c b/tests/service-manager-nostart-connect.c index 7107f42..ce0ac80 100644 --- a/tests/service-manager-nostart-connect.c +++ b/tests/service-manager-nostart-connect.c @@ -1,3 +1,25 @@ +/* +Test for libindicator + +Copyright 2009 Canonical Ltd. + +Authors: + Ted Gould + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +version 3.0 as published by the Free Software Foundation. + +This library 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 version 3.0 for more details. + +You should have received a copy of the GNU General Public +License along with this library. If not, see +. +*/ + #include #include "libindicator/indicator-service-manager.h" diff --git a/tests/service-shutdown-timeout.c b/tests/service-shutdown-timeout.c index 820441c..e461af0 100644 --- a/tests/service-shutdown-timeout.c +++ b/tests/service-shutdown-timeout.c @@ -1,3 +1,25 @@ +/* +Test for libindicator + +Copyright 2009 Canonical Ltd. + +Authors: + Ted Gould + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +version 3.0 as published by the Free Software Foundation. + +This library 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 version 3.0 for more details. + +You should have received a copy of the GNU General Public +License along with this library. If not, see +. +*/ + #include #include "libindicator/indicator-service.h" diff --git a/tests/service-version-bad-service.c b/tests/service-version-bad-service.c index 6057e74..12081d1 100644 --- a/tests/service-version-bad-service.c +++ b/tests/service-version-bad-service.c @@ -1,3 +1,25 @@ +/* +Test for libindicator + +Copyright 2009 Canonical Ltd. + +Authors: + Ted Gould + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +version 3.0 as published by the Free Software Foundation. + +This library 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 version 3.0 for more details. + +You should have received a copy of the GNU General Public +License along with this library. If not, see +. +*/ + #include #include "libindicator/indicator-service.h" diff --git a/tests/service-version-good-service.c b/tests/service-version-good-service.c index 12a6a32..17f987e 100644 --- a/tests/service-version-good-service.c +++ b/tests/service-version-good-service.c @@ -1,3 +1,25 @@ +/* +Test for libindicator + +Copyright 2009 Canonical Ltd. + +Authors: + Ted Gould + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +version 3.0 as published by the Free Software Foundation. + +This library 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 version 3.0 for more details. + +You should have received a copy of the GNU General Public +License along with this library. If not, see +. +*/ + #include #include "libindicator/indicator-service.h" diff --git a/tests/service-version-manager.c b/tests/service-version-manager.c index aedc0ed..9e582f5 100644 --- a/tests/service-version-manager.c +++ b/tests/service-version-manager.c @@ -1,3 +1,25 @@ +/* +Test for libindicator + +Copyright 2009 Canonical Ltd. + +Authors: + Ted Gould + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +version 3.0 as published by the Free Software Foundation. + +This library 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 version 3.0 for more details. + +You should have received a copy of the GNU General Public +License along with this library. If not, see +. +*/ + #include #include "libindicator/indicator-service-manager.h" diff --git a/tests/service-version-multiwatch-manager-impolite.c b/tests/service-version-multiwatch-manager-impolite.c index 8bfd3c6..b4cd1c8 100644 --- a/tests/service-version-multiwatch-manager-impolite.c +++ b/tests/service-version-multiwatch-manager-impolite.c @@ -1,3 +1,25 @@ +/* +Test for libindicator + +Copyright 2009 Canonical Ltd. + +Authors: + Ted Gould + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +version 3.0 as published by the Free Software Foundation. + +This library 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 version 3.0 for more details. + +You should have received a copy of the GNU General Public +License along with this library. If not, see +. +*/ + #include #include "libindicator/indicator-service-manager.h" diff --git a/tests/service-version-multiwatch-manager.c b/tests/service-version-multiwatch-manager.c index 771426f..4db6769 100644 --- a/tests/service-version-multiwatch-manager.c +++ b/tests/service-version-multiwatch-manager.c @@ -1,3 +1,25 @@ +/* +Test for libindicator + +Copyright 2009 Canonical Ltd. + +Authors: + Ted Gould + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +version 3.0 as published by the Free Software Foundation. + +This library 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 version 3.0 for more details. + +You should have received a copy of the GNU General Public +License along with this library. If not, see +. +*/ + #include #include "libindicator/indicator-service-manager.h" diff --git a/tests/service-version-multiwatch-service.c b/tests/service-version-multiwatch-service.c index 9920306..30b7f00 100644 --- a/tests/service-version-multiwatch-service.c +++ b/tests/service-version-multiwatch-service.c @@ -1,3 +1,25 @@ +/* +Test for libindicator + +Copyright 2009 Canonical Ltd. + +Authors: + Ted Gould + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +version 3.0 as published by the Free Software Foundation. + +This library 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 version 3.0 for more details. + +You should have received a copy of the GNU General Public +License along with this library. If not, see +. +*/ + #include #include "libindicator/indicator-service.h" diff --git a/tests/service-version-values.h b/tests/service-version-values.h index e9fb087..1a60460 100644 --- a/tests/service-version-values.h +++ b/tests/service-version-values.h @@ -1,3 +1,25 @@ +/* +Test for libindicator + +Copyright 2009 Canonical Ltd. + +Authors: + Ted Gould + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +version 3.0 as published by the Free Software Foundation. + +This library 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 version 3.0 for more details. + +You should have received a copy of the GNU General Public +License along with this library. If not, see +. +*/ + #define SERVICE_VERSION_GOOD 1342 #define SERVICE_VERSION_BAD 543 diff --git a/tests/test-desktop-shortcuts.c b/tests/test-desktop-shortcuts.c index 00dccd4..2e121fa 100644 --- a/tests/test-desktop-shortcuts.c +++ b/tests/test-desktop-shortcuts.c @@ -1,3 +1,25 @@ +/* +Test for libindicator + +Copyright 2009 Canonical Ltd. + +Authors: + Ted Gould + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +version 3.0 as published by the Free Software Foundation. + +This library 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 version 3.0 for more details. + +You should have received a copy of the GNU General Public +License along with this library. If not, see +. +*/ + #include #include "libindicator/indicator-desktop-shortcuts.h" diff --git a/tests/test-loader.c b/tests/test-loader.c index f5e05dc..ac9d4e5 100644 --- a/tests/test-loader.c +++ b/tests/test-loader.c @@ -1,3 +1,25 @@ +/* +Test for libindicator + +Copyright 2009 Canonical Ltd. + +Authors: + Ted Gould + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +version 3.0 as published by the Free Software Foundation. + +This library 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 version 3.0 for more details. + +You should have received a copy of the GNU General Public +License along with this library. If not, see +. +*/ + #include #include "libindicator/indicator-object.h" -- cgit v1.2.3 From fb0fab8ec38d33d0b32ebefecddba9ddd86b603b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 6 Jul 2011 16:30:16 -0500 Subject: Making some test XFAIL and attaching to bugs --- tests/Makefile.am | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/Makefile.am b/tests/Makefile.am index 569055c..e78ac6b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -6,6 +6,7 @@ endif TESTS = DISTCLEANFILES = +XFAIL_TESTS = check_PROGRAMS = @@ -257,6 +258,8 @@ service-manager-connect-tester: service-manager-connect service-manager-connect- TESTS += service-manager-connect-tester DISTCLEANFILES += service-manager-connect-tester session.conf service-manager-connect.service +# Bug 806690 +XFAIL_TESTS += service-manager-connect-tester ############################# # Service Versions @@ -320,6 +323,8 @@ service-version-tester: service-version-manager service-version-bad-service serv TESTS += service-version-tester DISTCLEANFILES += service-version-tester service-version-bad.service service-version-good.service +# Bug 806691 +XFAIL_TESTS += service-version-tester ############################# # Service Versions @@ -377,6 +382,8 @@ service-version-multiwatch-tester: service-version-multiwatch-manager service-ve TESTS += service-version-multiwatch-tester DISTCLEANFILES += service-version-multiwatch-tester +# Bug 806692 +XFAIL_TESTS += service-version-multiwatch-tester ############################# # Service Manager Shutdown -- cgit v1.2.3 From 6f2f14775574e792ca2209a97c20bc31af438928 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 6 Jul 2011 16:33:09 -0500 Subject: Switch to using gtk_box_new() --- tools/indicator-loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/indicator-loader.c b/tools/indicator-loader.c index 03614aa..0cdf1ff 100644 --- a/tools/indicator-loader.c +++ b/tools/indicator-loader.c @@ -44,7 +44,7 @@ entry_added (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_d g_debug("Signal: Entry Added"); GtkWidget * menuitem = gtk_menu_item_new(); - GtkWidget * hbox = gtk_hbox_new(FALSE, 3); + GtkWidget * hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3); if (entry->image != NULL) { gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(entry->image), FALSE, FALSE, 0); -- cgit v1.2.3 From cce6c17c1fd178a53fc9a79b57e0daef41d6aa4b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 6 Jul 2011 16:35:49 -0500 Subject: Cleaning up the built pc file --- libindicator/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am index 53c0058..4433655 100644 --- a/libindicator/Makefile.am +++ b/libindicator/Makefile.am @@ -22,6 +22,8 @@ INDICATOR_API_VERSION = 4 -e "s|\@indicator_abi_version\@|$(INDICATOR_ABI_VERSION)|" \ $< > $@ +CLEANFILES = indicator$(VER)-0.$(INDICATOR_API_VERSION).pc + include $(top_srcdir)/Makefile.am.marshal libindicatorincludedir=$(includedir)/libindicator$(VER)-0.$(INDICATOR_API_VERSION)/libindicator -- cgit v1.2.3 From 9cca8d7de8e5d04886aae8e7f2c118c4ca3c65e8 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 6 Jul 2011 16:35:52 -0500 Subject: 0.3.90 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index c951db5..1188b04 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_INIT([libindicator], - [0.3.22], + [0.3.90], [http://bugs.launchpad.net/libindicator], [libindicator], [http://launchpad.net/libindicator]) -- cgit v1.2.3 From f44a6bcf14243565e49f368b9db7423f49f871ce Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 7 Jul 2011 00:38:18 -0500 Subject: * debian/*install, control: Changing ABI version number bump in package names * debian/rules: Making GTK2 the special case as GTK3 is default now --- debian/changelog | 4 +++- debian/control | 18 ++++++++++-------- debian/libindicator3-3.install | 1 - debian/libindicator3-4.install | 1 + debian/libindicator3.install | 1 - debian/libindicator4.install | 1 + debian/rules | 40 ++++++++++++++++++++-------------------- 7 files changed, 35 insertions(+), 31 deletions(-) delete mode 100644 debian/libindicator3-3.install create mode 100644 debian/libindicator3-4.install delete mode 100644 debian/libindicator3.install create mode 100644 debian/libindicator4.install diff --git a/debian/changelog b/debian/changelog index bdba7bd..e8a7008 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,10 @@ libindicator (0.3.90-0ubuntu1~ppa1) UNRELEASED; urgency=low the future * Adding a name-hint to the indicator entries * Merging scroll functions into a single good one (LP: #804618) + * debian/*install, control: Changing ABI version number bump in package names + * debian/rules: Making GTK2 the special case as GTK3 is default now - -- Ted Gould Thu, 07 Jul 2011 00:28:56 -0500 + -- Ted Gould Thu, 07 Jul 2011 00:37:34 -0500 libindicator (0.3.22-0ubuntu2) oneiric; urgency=low diff --git a/debian/control b/debian/control index 5d03e92..c7cb436 100644 --- a/debian/control +++ b/debian/control @@ -18,13 +18,14 @@ Homepage: https://launchpad.net/libindicator Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/libindicator/ubuntu Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/libindicator/ubuntu -Package: libindicator3 +Package: libindicator4 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Breaks: libindicator1 (<= ${binary:Version}), - libindicator2 (<= ${binary:Version}) + libindicator2 (<= ${binary:Version}), + libindicator3 (<= ${binary:Version}) Description: panel indicator applet - shared library This library contains information to build indicators to go into the indicator applet. @@ -37,7 +38,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libgtk2.0-dev (>= 2.12.0), - libindicator3 (= ${binary:Version}) + libindicator4 (= ${binary:Version}) Description: panel indicator applet - library development files This library contains information to build indicators to go into the indicator applet. @@ -49,18 +50,19 @@ Section: devel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libindicator3 (= ${binary:Version}) + libindicator4 (= ${binary:Version}) Description: Tools for libindicator Tools useful for developers of applications using indicators. . This package contains files that are needed to build applications. -Package: libindicator3-3 +Package: libindicator3-4 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Breaks: libindicator3-2 (<= ${binary:Version}) +Breaks: libindicator3-2 (<= ${binary:Version}), + libindicator3-3 (<= ${binary:Version}) Description: panel indicator applet - shared library This library contains information to build indicators to go into the indicator applet. @@ -73,7 +75,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libgtk-3-dev (>= 2.91.3), - libindicator3-3 (= ${binary:Version}), + libindicator3-4 (= ${binary:Version}), libindicator-dev (= ${binary:Version}) Description: panel indicator applet - library development files This library contains information to build indicators to go into @@ -86,7 +88,7 @@ Section: devel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libindicator3-3 (= ${binary:Version}) + libindicator3-4 (= ${binary:Version}) Description: Tools for libindicator Tools useful for developers of applications using indicators. . diff --git a/debian/libindicator3-3.install b/debian/libindicator3-3.install deleted file mode 100644 index aaa2e72..0000000 --- a/debian/libindicator3-3.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libindicator3.so.* diff --git a/debian/libindicator3-4.install b/debian/libindicator3-4.install new file mode 100644 index 0000000..aaa2e72 --- /dev/null +++ b/debian/libindicator3-4.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libindicator3.so.* diff --git a/debian/libindicator3.install b/debian/libindicator3.install deleted file mode 100644 index 85dbd3e..0000000 --- a/debian/libindicator3.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libindicator.so.* diff --git a/debian/libindicator4.install b/debian/libindicator4.install new file mode 100644 index 0000000..85dbd3e --- /dev/null +++ b/debian/libindicator4.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libindicator.so.* diff --git a/debian/rules b/debian/rules index 4c21f86..4581c33 100755 --- a/debian/rules +++ b/debian/rules @@ -9,31 +9,31 @@ DEB_BUILDDIR = $(DEB_SRCDIR)/build LDFLAGS += -Wl,-z,defs -Wl,--as-needed -DEB_DH_MAKESHLIBS_ARGS_libindicator3 += -V 'libindicator3 (>= 0.3.19)' -DEB_DH_MAKESHLIBS_ARGS_libindicator3_3 += -V 'libindicator3-3 (>= 0.3.19)' +DEB_DH_MAKESHLIBS_ARGS_libindicator4 += -V 'libindicator4 (>= 0.3.90)' +DEB_DH_MAKESHLIBS_ARGS_libindicator3_4 += -V 'libindicator3-4 (>= 0.3.90)' -configure/libindicator3-3:: stamp-configure-gtk3 -stamp-configure-gtk3: - : # configure for GTK+ 3.0 +configure/libindicator4:: stamp-configure-gtk2 +stamp-configure-gtk2: + : # configure for GTK+ 2.0 set -e; \ - rm -rf build-gtk3; \ - mkdir build-gtk3; \ - cd build-gtk3; \ - $(DEB_CONFIGURE_SCRIPT_ENV) ../configure --with-gtk=3 \ + rm -rf build-gtk2; \ + mkdir build-gtk2; \ + cd build-gtk2; \ + $(DEB_CONFIGURE_SCRIPT_ENV) ../configure --with-gtk=2 \ $(filter-out --srcdir=%, $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS)); \ cd ..; - touch stamp-configure-gtk3 + touch stamp-configure-gtk2 -build/libindicator3-3:: stamp-build-gtk3 -stamp-build-gtk3: stamp-configure-gtk3 - : # build for GTK+ 3.0 - $(MAKE) -C build-gtk3; - touch stamp-build-gtk3 +build/libindicator4:: stamp-build-gtk2 +stamp-build-gtk2: stamp-configure-gtk2 + : # build for GTK+ 2.0 + $(MAKE) -C build-gtk2; + touch stamp-build-gtk2 -common-install-prehook-arch:: stamp-build-gtk3 - : # install for GTK+ 3.0 - $(MAKE) -C build-gtk3 DESTDIR=$(CURDIR)/debian/tmp install +common-install-prehook-arch:: stamp-build-gtk2 + : # install for GTK+ 2.0 + $(MAKE) -C build-gtk2 DESTDIR=$(CURDIR)/debian/tmp install clean:: - rm -f stamp-*-gtk3 - rm -rf build-gtk3 + rm -f stamp-*-gtk2 + rm -rf build-gtk2 -- cgit v1.2.3 From 24123eb5db81654167423780fc2d84f1de228bb3 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 7 Jul 2011 00:40:51 -0500 Subject: debian/*install: Fixing pkgconfig file names --- debian/changelog | 3 ++- debian/libindicator-dev.install | 4 ++-- debian/libindicator3-dev.install | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index e8a7008..3aa8cbc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,8 +9,9 @@ libindicator (0.3.90-0ubuntu1~ppa1) UNRELEASED; urgency=low * Merging scroll functions into a single good one (LP: #804618) * debian/*install, control: Changing ABI version number bump in package names * debian/rules: Making GTK2 the special case as GTK3 is default now + * debian/*install: Fixing pkgconfig file names - -- Ted Gould Thu, 07 Jul 2011 00:37:34 -0500 + -- Ted Gould Thu, 07 Jul 2011 00:40:35 -0500 libindicator (0.3.22-0ubuntu2) oneiric; urgency=low diff --git a/debian/libindicator-dev.install b/debian/libindicator-dev.install index bbdcdeb..7f34ecd 100644 --- a/debian/libindicator-dev.install +++ b/debian/libindicator-dev.install @@ -1,4 +1,4 @@ -debian/tmp/usr/include/libindicator-0.3/libindicator/* -debian/tmp/usr/lib/pkgconfig/indicator.pc +debian/tmp/usr/include/libindicator-0.4/libindicator/* +debian/tmp/usr/lib/pkgconfig/indicator-0.4.pc debian/tmp/usr/lib/libindicator.a debian/tmp/usr/lib/libindicator.so diff --git a/debian/libindicator3-dev.install b/debian/libindicator3-dev.install index 2ac38b7..7381df0 100644 --- a/debian/libindicator3-dev.install +++ b/debian/libindicator3-dev.install @@ -1,3 +1,3 @@ -debian/tmp/usr/lib/pkgconfig/indicator3.pc +debian/tmp/usr/lib/pkgconfig/indicator3-0.4.pc debian/tmp/usr/lib/libindicator3.a debian/tmp/usr/lib/libindicator3.so -- cgit v1.2.3 From 14cdff4c343ce0eee37f769a0ba815222c405086 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 7 Jul 2011 08:25:11 -0500 Subject: Handling the right box for the right version of GTK --- tools/indicator-loader.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/indicator-loader.c b/tools/indicator-loader.c index 0cdf1ff..027d364 100644 --- a/tools/indicator-loader.c +++ b/tools/indicator-loader.c @@ -44,7 +44,11 @@ entry_added (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_d g_debug("Signal: Entry Added"); GtkWidget * menuitem = gtk_menu_item_new(); +#if GTK_CHECK_VERSION(3,0,0) GtkWidget * hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3); +#else + GtkWidget * hbox = gtk_hbox_new(FALSE, 3); +#endif if (entry->image != NULL) { gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(entry->image), FALSE, FALSE, 0); -- cgit v1.2.3 From 8677620e7825d0ac249f5bc71210e4cf5dab53ec Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 7 Jul 2011 08:29:41 -0500 Subject: releasing version 0.3.90-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3aa8cbc..5cc9fb0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libindicator (0.3.90-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.3.90-0ubuntu1~ppa1) oneiric; urgency=low * New upstream release. * Build Fixes @@ -11,7 +11,7 @@ libindicator (0.3.90-0ubuntu1~ppa1) UNRELEASED; urgency=low * debian/rules: Making GTK2 the special case as GTK3 is default now * debian/*install: Fixing pkgconfig file names - -- Ted Gould Thu, 07 Jul 2011 00:40:35 -0500 + -- Ted Gould Thu, 07 Jul 2011 08:29:37 -0500 libindicator (0.3.22-0ubuntu2) oneiric; urgency=low -- cgit v1.2.3