From 0373d6fcb3f7b62028db4978ba215c403b43fed9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Wed, 25 Jan 2012 11:55:37 +0100 Subject: IndicatorObject: correctly initialize the parent object. --- libindicator/indicator-object.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c index 849fb9f..6e25387 100644 --- a/libindicator/indicator-object.c +++ b/libindicator/indicator-object.c @@ -348,6 +348,7 @@ indicator_object_dispose (GObject *object) if (entry_get_private(io, entry)->visibility == ENTRY_INVISIBLE) { g_signal_emit(io, signals[ENTRY_ADDED], detail, entry); } + entry->parent_object = NULL; } g_list_free (entries); @@ -507,6 +508,8 @@ get_entries_default (IndicatorObject * io) if (!priv->gotten_entries) { IndicatorObjectClass * class = INDICATOR_OBJECT_GET_CLASS(io); + priv->entry.parent_object = io; + if (class->get_label) { priv->entry.label = class->get_label(io); } @@ -551,7 +554,7 @@ get_entries_default (IndicatorObject * io) static GList* get_all_entries (IndicatorObject * io) { - GList * all_entries = NULL; + GList * all_entries = NULL, *l; g_return_val_if_fail(INDICATOR_IS_OBJECT(io), NULL); IndicatorObjectClass * class = INDICATOR_OBJECT_GET_CLASS(io); @@ -559,8 +562,16 @@ get_all_entries (IndicatorObject * io) if (class->get_entries == NULL) g_error("No get_entries function on object. It must have been deleted?!?!"); else + { all_entries = class->get_entries(io); + for (l = all_entries; l; l = l->next) + { + IndicatorObjectEntry *entry = l->data; + entry->parent_object = io; + } + } + return all_entries; } @@ -757,6 +768,7 @@ indicator_object_entry_being_removed (IndicatorObject * io, IndicatorObjectEntry IndicatorObjectClass * class = INDICATOR_OBJECT_GET_CLASS(io); entry_get_private (io, entry)->visibility = ENTRY_INVISIBLE; + entry->parent_object = NULL; if (class->entry_being_removed != NULL) class->entry_being_removed (io, entry); @@ -769,6 +781,7 @@ indicator_object_entry_was_added (IndicatorObject * io, IndicatorObjectEntry * e IndicatorObjectClass * class = INDICATOR_OBJECT_GET_CLASS(io); entry_get_private (io, entry)->visibility = ENTRY_VISIBLE; + entry->parent_object = io; if (class->entry_was_added != NULL) class->entry_was_added (io, entry); -- cgit v1.2.3 From c9df18becfc38ab3e3a833d0095c26f5140800e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Wed, 25 Jan 2012 12:21:51 +0100 Subject: Indicator-Object: update the parent_object value only if the entry is valid. --- libindicator/indicator-object.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c index 6e25387..91f45ff 100644 --- a/libindicator/indicator-object.c +++ b/libindicator/indicator-object.c @@ -348,7 +348,9 @@ indicator_object_dispose (GObject *object) if (entry_get_private(io, entry)->visibility == ENTRY_INVISIBLE) { g_signal_emit(io, signals[ENTRY_ADDED], detail, entry); } - entry->parent_object = NULL; + + if (entry) + entry->parent_object = NULL; } g_list_free (entries); @@ -568,7 +570,9 @@ get_all_entries (IndicatorObject * io) for (l = all_entries; l; l = l->next) { IndicatorObjectEntry *entry = l->data; - entry->parent_object = io; + + if (entry) + entry->parent_object = io; } } @@ -768,10 +772,14 @@ indicator_object_entry_being_removed (IndicatorObject * io, IndicatorObjectEntry IndicatorObjectClass * class = INDICATOR_OBJECT_GET_CLASS(io); entry_get_private (io, entry)->visibility = ENTRY_INVISIBLE; - entry->parent_object = NULL; if (class->entry_being_removed != NULL) + { + if (entry) + entry->parent_object = NULL; + class->entry_being_removed (io, entry); + } } static void @@ -781,10 +789,14 @@ indicator_object_entry_was_added (IndicatorObject * io, IndicatorObjectEntry * e IndicatorObjectClass * class = INDICATOR_OBJECT_GET_CLASS(io); entry_get_private (io, entry)->visibility = ENTRY_VISIBLE; - entry->parent_object = io; if (class->entry_was_added != NULL) + { + if (entry) + entry->parent_object = io; + class->entry_was_added (io, entry); + } } /** -- cgit v1.2.3 From c26baddf8b8f8a290557f1a51d4e957bc95e45c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Wed, 25 Jan 2012 12:22:12 +0100 Subject: Added better parent_object tests. --- tests/test-loader.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/test-loader.c b/tests/test-loader.c index 6f9d25b..b567733 100644 --- a/tests/test-loader.c +++ b/tests/test-loader.c @@ -190,6 +190,8 @@ test_loader_filename_dummy_visible (void) g_assert(entry != NULL); g_list_free(list); g_assert(GTK_IS_LABEL(entry->label)); + g_assert(entry->parent_object == object); + g_assert(INDICATOR_IS_OBJECT(entry->parent_object)); GtkWidget * label = GTK_WIDGET(entry->label); g_assert(g_object_get_qdata(G_OBJECT(label), is_hidden_quark) == NULL); @@ -239,9 +241,11 @@ test_loader_filename_dummy_simple_location (void) g_assert(entries != NULL); g_assert(g_list_length(entries) == 1); - g_assert(indicator_object_get_location(object, (IndicatorObjectEntry *)entries->data) == 0); + IndicatorObjectEntry *entry = entries->data; + + g_assert(indicator_object_get_location(object, entry) == 0); g_assert(indicator_object_get_location(object, NULL) == 0); - g_assert(((IndicatorObjectEntry *)entries->data)->parent_object != NULL); + g_assert(entry->parent_object == object); g_object_unref(object); -- cgit v1.2.3 From 1baaf2880f44fea4519f323e3da425318af6c688 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Wed, 25 Jan 2012 18:10:29 +0100 Subject: IndicatorObject: update object parent in any case. --- libindicator/indicator-object.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c index 91f45ff..d0b3ecf 100644 --- a/libindicator/indicator-object.c +++ b/libindicator/indicator-object.c @@ -773,11 +773,11 @@ indicator_object_entry_being_removed (IndicatorObject * io, IndicatorObjectEntry entry_get_private (io, entry)->visibility = ENTRY_INVISIBLE; + if (entry) + entry->parent_object = NULL; + if (class->entry_being_removed != NULL) { - if (entry) - entry->parent_object = NULL; - class->entry_being_removed (io, entry); } } @@ -790,11 +790,11 @@ indicator_object_entry_was_added (IndicatorObject * io, IndicatorObjectEntry * e entry_get_private (io, entry)->visibility = ENTRY_VISIBLE; + if (entry) + entry->parent_object = io; + if (class->entry_was_added != NULL) { - if (entry) - entry->parent_object = io; - class->entry_was_added (io, entry); } } -- cgit v1.2.3 From 39cf870292e40bd72a16fc10b20135e294d4e269 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Wed, 25 Jan 2012 18:11:07 +0100 Subject: Tests: update dummy signaler to work with real IndicatorObjectEntry This fixes a crash due to the parent/unparent. --- tests/dummy-indicator-signaler.c | 17 ++++++++++++++--- tests/test-loader.c | 23 ++++++++++++++--------- 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/tests/dummy-indicator-signaler.c b/tests/dummy-indicator-signaler.c index c7a5c1f..9908d3d 100644 --- a/tests/dummy-indicator-signaler.c +++ b/tests/dummy-indicator-signaler.c @@ -110,9 +110,20 @@ idle_signal (gpointer data) { DummyIndicatorSignaler * self = DUMMY_INDICATOR_SIGNALER(data); - g_signal_emit(G_OBJECT(self), INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED_ID, 0, GUINT_TO_POINTER(5), TRUE); - g_signal_emit(G_OBJECT(self), INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED_ID, 0, GUINT_TO_POINTER(5), TRUE); - g_signal_emit(G_OBJECT(self), INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED_ID, 0, GUINT_TO_POINTER(5), 0, 1, TRUE); + IndicatorObjectEntry *added_entry, *removed_entry, *moved_entry; + IndicatorObjectEntry *entries = g_new0(IndicatorObjectEntry, 3); + + added_entry = &entries[0]; + moved_entry = &entries[1]; + removed_entry = &entries[2]; + + added_entry->name_hint = "added"; + moved_entry->name_hint = "moved"; + removed_entry->name_hint = "removed"; + + g_signal_emit(G_OBJECT(self), INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED_ID, 0, added_entry); + g_signal_emit(G_OBJECT(self), INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED_ID, 0, moved_entry, 0, 1); + g_signal_emit(G_OBJECT(self), INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED_ID, 0, removed_entry); return FALSE; /* Don't queue again */ } diff --git a/tests/test-loader.c b/tests/test-loader.c index b567733..2140294 100644 --- a/tests/test-loader.c +++ b/tests/test-loader.c @@ -100,8 +100,8 @@ void destroy_cb (gpointer data, GObject * object); void entry_change_cb (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer data) { - gpointer * valuestore = (gpointer *)data; - *valuestore = entry; + IndicatorObjectEntry *other_entry = data; + other_entry->name_hint = entry->name_hint; return; } @@ -117,11 +117,16 @@ test_loader_filename_dummy_signaler (void) IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/.libs/libdummy-indicator-signaler.so"); g_assert(object != NULL); - gpointer added_value = NULL, removed_value = NULL, moved_value = NULL; + IndicatorObjectEntry *added_entry, *moved_entry, *removed_entry; + IndicatorObjectEntry entries[3]; - g_signal_connect(G_OBJECT(object), INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED, G_CALLBACK(entry_change_cb), &added_value); - g_signal_connect(G_OBJECT(object), INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED, G_CALLBACK(entry_change_cb), &removed_value); - g_signal_connect(G_OBJECT(object), INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED, G_CALLBACK(entry_move_cb), &moved_value); + added_entry = &entries[0]; + moved_entry = &entries[1]; + removed_entry = &entries[2]; + + g_signal_connect_after(G_OBJECT(object), INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED, G_CALLBACK(entry_change_cb), added_entry); + g_signal_connect_after(G_OBJECT(object), INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED, G_CALLBACK(entry_move_cb), moved_entry); + g_signal_connect_after(G_OBJECT(object), INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED, G_CALLBACK(entry_change_cb), removed_entry); GList * list = indicator_object_get_entries(object); g_assert(list != NULL); @@ -131,9 +136,9 @@ test_loader_filename_dummy_signaler (void) g_main_context_iteration(NULL, TRUE); } - g_assert(GPOINTER_TO_UINT(added_value) == 5); - g_assert(GPOINTER_TO_UINT(removed_value) == 5); - g_assert(GPOINTER_TO_UINT(moved_value) == 5); + g_assert(g_strcmp0(added_entry->name_hint, "added") == 0); + g_assert(g_strcmp0(removed_entry->name_hint, "removed") == 0); + g_assert(g_strcmp0(moved_entry->name_hint, "moved") == 0); g_object_unref(object); -- cgit v1.2.3 From c87aff749b07f228e3fa69c1155d9128ef07620c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Wed, 25 Jan 2012 18:11:43 +0100 Subject: Test loader: check also for parent changes --- tests/test-loader.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/test-loader.c b/tests/test-loader.c index 2140294..28c56aa 100644 --- a/tests/test-loader.c +++ b/tests/test-loader.c @@ -102,6 +102,7 @@ entry_change_cb (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer da { IndicatorObjectEntry *other_entry = data; other_entry->name_hint = entry->name_hint; + other_entry->parent_object = entry->parent_object; return; } @@ -140,6 +141,9 @@ test_loader_filename_dummy_signaler (void) g_assert(g_strcmp0(removed_entry->name_hint, "removed") == 0); g_assert(g_strcmp0(moved_entry->name_hint, "moved") == 0); + g_assert(added_entry->parent_object == object); + g_assert(removed_entry->parent_object == NULL); + g_object_unref(object); return; -- cgit v1.2.3 From 7ae413b583259eb8c312511c4da5f0558d2daab9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Fri, 3 Feb 2012 15:34:07 +0100 Subject: tests, DummyIndicatorSignaler: free the allocated memory. --- tests/dummy-indicator-signaler.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/dummy-indicator-signaler.c b/tests/dummy-indicator-signaler.c index 9908d3d..a4206d0 100644 --- a/tests/dummy-indicator-signaler.c +++ b/tests/dummy-indicator-signaler.c @@ -42,6 +42,7 @@ struct _DummyIndicatorSignalerClass { struct _DummyIndicatorSignaler { IndicatorObject parent; + IndicatorObjectEntry *entries; }; GType dummy_indicator_signaler_get_type (void); @@ -111,11 +112,10 @@ idle_signal (gpointer data) DummyIndicatorSignaler * self = DUMMY_INDICATOR_SIGNALER(data); IndicatorObjectEntry *added_entry, *removed_entry, *moved_entry; - IndicatorObjectEntry *entries = g_new0(IndicatorObjectEntry, 3); - added_entry = &entries[0]; - moved_entry = &entries[1]; - removed_entry = &entries[2]; + added_entry = &self->entries[0]; + moved_entry = &self->entries[1]; + removed_entry = &self->entries[2]; added_entry->name_hint = "added"; moved_entry->name_hint = "moved"; @@ -131,6 +131,7 @@ idle_signal (gpointer data) static void dummy_indicator_signaler_init (DummyIndicatorSignaler *self) { + self->entries = g_new0(IndicatorObjectEntry, 3); g_idle_add(idle_signal, self); return; } @@ -146,7 +147,8 @@ dummy_indicator_signaler_dispose (GObject *object) static void dummy_indicator_signaler_finalize (GObject *object) { - + DummyIndicatorSignaler * self = DUMMY_INDICATOR_SIGNALER(object); + g_free (self->entries); G_OBJECT_CLASS (dummy_indicator_signaler_parent_class)->finalize (object); return; } -- cgit v1.2.3 From 2375490ebb1d570adb92d235323a0c9156435d23 Mon Sep 17 00:00:00 2001 From: Daniel d'Andrada Date: Thu, 9 Feb 2012 11:05:55 -0200 Subject: Plug memory leak in parse_keyfile function. --- libindicator/indicator-desktop-shortcuts.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libindicator/indicator-desktop-shortcuts.c b/libindicator/indicator-desktop-shortcuts.c index 62bf504..2ae78f9 100644 --- a/libindicator/indicator-desktop-shortcuts.c +++ b/libindicator/indicator-desktop-shortcuts.c @@ -281,6 +281,7 @@ parse_keyfile (IndicatorDesktopShortcuts * ids) gchar * nickalloc = g_strdup(nicks[i]); g_array_append_val(priv->nicks, nickalloc); + g_free(groupname); } if (nicks != NULL) { -- cgit v1.2.3 From 5f599a8cabbbc451e6c0846598453eb2618d4405 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Sun, 12 Feb 2012 13:40:21 +0100 Subject: indicator_object_set_visible: only emit entry-{added,removed} when visibility actually changed Emitting those signals is semantically incorrect. It also confused indicator-loader and the panel, because they are not checking whether an entry is already present in their entry-added handlers. This led to gtk warnings ("widget already has a parent") and strange effects, such as the same menu being added multiple times into the panel. --- libindicator/indicator-object.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c index d0b3ecf..1d0db58 100644 --- a/libindicator/indicator-object.c +++ b/libindicator/indicator-object.c @@ -886,9 +886,16 @@ indicator_object_set_visible (IndicatorObject * io, gboolean visible) GList * l; GList * entries = get_all_entries (io); const guint signal_id = signals[visible ? ENTRY_ADDED : ENTRY_REMOVED]; + EntryVisibility visibility = visible ? ENTRY_VISIBLE : ENTRY_INVISIBLE; const GQuark detail = (GQuark)0; + for (l=entries; l!=NULL; l=l->next) - g_signal_emit(io, signal_id, detail, l->data); + { + IndicatorObjectEntry *entry = l->data; + EntryVisibility v = entry_get_private (io, entry)->visibility; + if (v == ENTRY_INIT || v != visibility) + g_signal_emit(io, signal_id, detail, entry); + } g_list_free (entries); } -- cgit v1.2.3 From e7780ac9f99dda5fea04721be0b2b26050442c8c Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Mon, 13 Feb 2012 19:08:27 +0100 Subject: indicator_object_set_visible: no need to check for ENTRY_INIT --- libindicator/indicator-object.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c index 1d0db58..a67b4e4 100644 --- a/libindicator/indicator-object.c +++ b/libindicator/indicator-object.c @@ -889,11 +889,9 @@ indicator_object_set_visible (IndicatorObject * io, gboolean visible) EntryVisibility visibility = visible ? ENTRY_VISIBLE : ENTRY_INVISIBLE; const GQuark detail = (GQuark)0; - for (l=entries; l!=NULL; l=l->next) - { + for (l=entries; l!=NULL; l=l->next) { IndicatorObjectEntry *entry = l->data; - EntryVisibility v = entry_get_private (io, entry)->visibility; - if (v == ENTRY_INIT || v != visibility) + if (entry_get_private (io, entry)->visibility != visibility) g_signal_emit(io, signal_id, detail, entry); } g_list_free (entries); -- cgit v1.2.3 From 73c0659d30445a2202faf1d0b87c2464f02b51e3 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Mon, 13 Feb 2012 19:15:03 +0100 Subject: indicator_object_dispose: use _set_visible instead of reimplementing it --- libindicator/indicator-object.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c index a67b4e4..2ce40e2 100644 --- a/libindicator/indicator-object.c +++ b/libindicator/indicator-object.c @@ -337,21 +337,11 @@ static void indicator_object_dispose (GObject *object) { IndicatorObject * io = INDICATOR_OBJECT(object); + GList * entries = get_all_entries (io); /* Ensure that hidden entries are re-added so their widgetry will be cleaned up properly by the client */ - GList * l; - GList * entries = get_all_entries (io); - const GQuark detail = (GQuark)0; - for (l=entries; l!=NULL; l=l->next) { - IndicatorObjectEntry * entry = l->data; - if (entry_get_private(io, entry)->visibility == ENTRY_INVISIBLE) { - g_signal_emit(io, signals[ENTRY_ADDED], detail, entry); - } - - if (entry) - entry->parent_object = NULL; - } + indicator_object_set_visible (io, TRUE); g_list_free (entries); G_OBJECT_CLASS (indicator_object_parent_class)->dispose (object); -- cgit v1.2.3 From b2ca0dbe7704098144b6ccd103dd760ad7dd3636 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Mon, 13 Feb 2012 19:38:10 +0100 Subject: indicator_object_dispose: remove unneeded list of entries --- libindicator/indicator-object.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c index 2ce40e2..a348d9a 100644 --- a/libindicator/indicator-object.c +++ b/libindicator/indicator-object.c @@ -336,13 +336,9 @@ indicator_object_init (IndicatorObject *self) static void indicator_object_dispose (GObject *object) { - IndicatorObject * io = INDICATOR_OBJECT(object); - GList * entries = get_all_entries (io); - /* Ensure that hidden entries are re-added so their widgetry will be cleaned up properly by the client */ - indicator_object_set_visible (io, TRUE); - g_list_free (entries); + indicator_object_set_visible (INDICATOR_OBJECT (object), TRUE); G_OBJECT_CLASS (indicator_object_parent_class)->dispose (object); } -- cgit v1.2.3 From f099181abb550bbc7bb409e76ad22f58dc7f14c4 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 14 Feb 2012 11:35:11 -0600 Subject: 0.4.91 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index e881de0..38dd416 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_INIT([libindicator], - [0.4.90], + [0.4.91], [http://bugs.launchpad.net/libindicator], [libindicator], [http://launchpad.net/libindicator]) -- cgit v1.2.3 From b2a5f94bf7807e640d8b11dc33e0025c0f2036d5 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 14 Feb 2012 11:52:00 -0600 Subject: Dropping debian/patches --- debian/changelog | 3 ++- debian/patches/debian-changes | 40 ---------------------------------------- debian/patches/series | 1 - 3 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 debian/patches/debian-changes delete mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index 0f1395f..090c203 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,9 @@ libindicator (0.4.91-0ubuntu1~ppa1) UNRELEASED; urgency=low * Visibility fixes for indicators using that functionality * Ensure that parent_object is more aggressively set * Fix memory leak on groups of items in desktop files + * Dropping debian/patches - -- Ted Gould Tue, 14 Feb 2012 11:49:19 -0600 + -- Ted Gould Tue, 14 Feb 2012 11:51:52 -0600 libindicator (0.4.90-0ubuntu4) precise; urgency=low diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes deleted file mode 100644 index 91e0322..0000000 --- a/debian/patches/debian-changes +++ /dev/null @@ -1,40 +0,0 @@ -Description: - TODO: Put a short summary on the line above and replace this paragraph - with a longer explanation of this change. Complete the meta-information - with other relevant fields (see below for details). To make it easier, the - information below has been extracted from the changelog. Adjust it or drop - it. - . - libindicator (0.4.1-1) experimental; urgency=low - . - * Merge from Ubuntu. - + Re-enable GTK3 packages. - + Link to libm to prevent FTBFS. - Closes: #640459 - * Set single-debian-patch in debian/source/options. -Author: Evgeni Golov -Bug-Debian: http://bugs.debian.org/640459 - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: http://bugs.debian.org/ -Bug-Ubuntu: https://launchpad.net/bugs/ -Forwarded: -Reviewed-By: -Last-Update: - ---- libindicator-0.4.1.orig/tools/Makefile.am -+++ libindicator-0.4.1/tools/Makefile.am -@@ -19,6 +19,7 @@ indicator_loader_SOURCES = \ - indicator_loader_CFLAGS = \ - -Wall -Werror \ - $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \ -+ -Wall -Werror \ - -DBUILD_DIR="\"$(builddir)\"" - - indicator_loader_LDADD = \ diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 7bb8252..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -debian-changes -- cgit v1.2.3 From 45aebde8abddd54f52333fd9cd2462eb0497f5dc Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 14 Feb 2012 14:20:54 -0600 Subject: Explicity add gmodule in the list of required libraries --- configure.ac | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure.ac b/configure.ac index 38dd416..3f33d52 100644 --- a/configure.ac +++ b/configure.ac @@ -52,10 +52,12 @@ AC_ARG_WITH([gtk], [with_gtk=3]) AS_IF([test "x$with_gtk" = x3], [PKG_CHECK_MODULES(LIBINDICATOR, gtk+-3.0 >= $GTK3_REQUIRED_VERSION + gmodule-2.0 gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION) ], [test "x$with_gtk" = x2], [PKG_CHECK_MODULES(LIBINDICATOR, gtk+-2.0 >= $GTK_REQUIRED_VERSION + gmodule-2.0 gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION) ], [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])] -- cgit v1.2.3 From 36b39c96eac1bcadaf506a52b6c583155559458b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 14 Feb 2012 14:23:06 -0600 Subject: debian/control, debian/rules: Adding in autoreconf support --- debian/changelog | 3 ++- debian/control | 1 + debian/rules | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 37ed70f..c92d5d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,9 @@ libindicator (0.4.91-0ubuntu1~ppa1) UNRELEASED; urgency=low * Dropping debian/patches * Upstream Merge * Explicitly add in gmodule as a required library + * debian/control, debian/rules: Adding in autoreconf support - -- Ted Gould Tue, 14 Feb 2012 14:21:17 -0600 + -- Ted Gould Tue, 14 Feb 2012 14:22:50 -0600 libindicator (0.4.90-0ubuntu4) precise; urgency=low diff --git a/debian/control b/debian/control index 90e1367..4816b56 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,7 @@ Maintainer: Ubuntu Core Developers XSBC-Original-Maintainer: The Ayatana Packagers Uploaders: Evgeni Golov , Kartik Mistry Build-Depends: debhelper (>= 5.0), + dh-autoreconf, cdbs (>= 0.4.41), libglib2.0-dev (>= 2.22), libgtk2.0-dev (>= 2.18), diff --git a/debian/rules b/debian/rules index f62d05a..7e69bc0 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,7 @@ DEB_MAKE_FLAVORS = gtk2 gtk3 include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/autoreconf.mk DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@ DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/ -- cgit v1.2.3 From 7f1272a5681547e6a6cb083b699be4770c08ac96 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 14 Feb 2012 14:27:38 -0600 Subject: * debian/control, debian/rules: * Adding in autoreconf support * Adding a check rule and requiring new build deps --- debian/changelog | 6 ++++-- debian/control | 3 ++- debian/rules | 2 ++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index c92d5d9..3232851 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,9 +7,11 @@ libindicator (0.4.91-0ubuntu1~ppa1) UNRELEASED; urgency=low * Dropping debian/patches * Upstream Merge * Explicitly add in gmodule as a required library - * debian/control, debian/rules: Adding in autoreconf support + * debian/control, debian/rules: + * Adding in autoreconf support + * Adding a check rule and requiring new build deps - -- Ted Gould Tue, 14 Feb 2012 14:22:50 -0600 + -- Ted Gould Tue, 14 Feb 2012 14:27:03 -0600 libindicator (0.4.90-0ubuntu4) precise; urgency=low diff --git a/debian/control b/debian/control index 4816b56..998c41c 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,8 @@ Build-Depends: debhelper (>= 5.0), libtool, intltool, gtk-doc-tools, - dh-autoreconf + dbus-test-runner, + xvfb Standards-Version: 3.9.2 Homepage: https://launchpad.net/libindicator Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/libindicator/ubuntu diff --git a/debian/rules b/debian/rules index 7e69bc0..e74ddd1 100755 --- a/debian/rules +++ b/debian/rules @@ -13,6 +13,8 @@ DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/ DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2 DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3 +DEB_MAKE_CHECK_TARGET := check + LDFLAGS += -Wl,-z,defs -Wl,--as-needed DEB_DH_MAKESHLIBS_ARGS_libindicator7 += -V 'libindicator7 (>= 0.4.90)' -- cgit v1.2.3 From 05f46d7e9a048f8427f3261ff3b52c0b9fdbcde7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 14 Feb 2012 14:29:53 -0600 Subject: releasing version 0.4.91-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3232851..6b66327 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libindicator (0.4.91-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.4.91-0ubuntu1~ppa1) precise; urgency=low * New upstream release. * Visibility fixes for indicators using that functionality @@ -11,7 +11,7 @@ libindicator (0.4.91-0ubuntu1~ppa1) UNRELEASED; urgency=low * Adding in autoreconf support * Adding a check rule and requiring new build deps - -- Ted Gould Tue, 14 Feb 2012 14:27:03 -0600 + -- Ted Gould Tue, 14 Feb 2012 14:29:51 -0600 libindicator (0.4.90-0ubuntu4) precise; urgency=low -- cgit v1.2.3