From 670e6e0bffe139445192d920f3cfb38ea102858e Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Sun, 22 Apr 2012 14:24:13 -0500 Subject: indiator_service_manager_new*()'s name arguments were gchar*, make them const gchar* --- libindicator/indicator-service-manager.c | 4 ++-- libindicator/indicator-service-manager.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libindicator/indicator-service-manager.c b/libindicator/indicator-service-manager.c index f58c148..a427954 100644 --- a/libindicator/indicator-service-manager.c +++ b/libindicator/indicator-service-manager.c @@ -636,7 +636,7 @@ start_service_again (IndicatorServiceManager * manager) object. */ IndicatorServiceManager * -indicator_service_manager_new (gchar * dbus_name) +indicator_service_manager_new (const gchar * dbus_name) { GObject * obj = g_object_new(INDICATOR_SERVICE_MANAGER_TYPE, PROP_NAME_S, dbus_name, @@ -660,7 +660,7 @@ indicator_service_manager_new (gchar * dbus_name) object. */ IndicatorServiceManager * -indicator_service_manager_new_version (gchar * dbus_name, guint version) +indicator_service_manager_new_version (const gchar * dbus_name, guint version) { GObject * obj = g_object_new(INDICATOR_SERVICE_MANAGER_TYPE, PROP_NAME_S, dbus_name, diff --git a/libindicator/indicator-service-manager.h b/libindicator/indicator-service-manager.h index bf6d1b0..7d444c6 100644 --- a/libindicator/indicator-service-manager.h +++ b/libindicator/indicator-service-manager.h @@ -76,8 +76,8 @@ struct _IndicatorServiceManager { GType indicator_service_manager_get_type (void); -IndicatorServiceManager * indicator_service_manager_new (gchar * dbus_name); -IndicatorServiceManager * indicator_service_manager_new_version (gchar * dbus_name, +IndicatorServiceManager * indicator_service_manager_new (const gchar * dbus_name); +IndicatorServiceManager * indicator_service_manager_new_version (const gchar * dbus_name, guint version); gboolean indicator_service_manager_connected (IndicatorServiceManager * sm); void indicator_service_manager_set_refresh (IndicatorServiceManager * sm, -- cgit v1.2.3 From 5d3f97c65af769b59da9b909f52951646f85cd28 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Sun, 10 Jun 2012 11:16:21 +0200 Subject: don't include build-time filenames in comments of the enum header files If we do, the header files may be different on each build. This is especially harmful when building multiple times for multiple architectures and expecting the files to be identical. --- libindicator/indicator-object-enum-types.c.template | 4 ++-- libindicator/indicator-object-enum-types.h.template | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libindicator/indicator-object-enum-types.c.template b/libindicator/indicator-object-enum-types.c.template index dd7d595..e5b3352 100644 --- a/libindicator/indicator-object-enum-types.c.template +++ b/libindicator/indicator-object-enum-types.c.template @@ -3,8 +3,8 @@ /*** END file-header ***/ /*** BEGIN file-production ***/ -/* enumerations from "@filename@" */ -#include "@filename@" +/* enumerations from "@basename@" */ +#include "@basename@" /*** END file-production ***/ /*** BEGIN value-header ***/ diff --git a/libindicator/indicator-object-enum-types.h.template b/libindicator/indicator-object-enum-types.h.template index 07175a0..2ac8ef8 100644 --- a/libindicator/indicator-object-enum-types.h.template +++ b/libindicator/indicator-object-enum-types.h.template @@ -10,7 +10,7 @@ G_BEGIN_DECLS /*** END file-header ***/ /*** BEGIN file-production ***/ -/* enumerations from "@filename@" */ +/* enumerations from "@basename@" */ /*** END file-production ***/ /*** BEGIN file-tail ***/ -- cgit v1.2.3 From 26dcee434894a51bd8460054e4671d531367426d Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Mon, 18 Jun 2012 13:42:53 -0500 Subject: fix copy-and-paste error in specifying the tests' source files --- tests/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 9319087..c98bdbf 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -371,7 +371,7 @@ DISTCLEANFILES += service-version-tester service-version-bad.service service-ver check_PROGRAMS += service-version-multiwatch-manager -service_version_manager_SOURCES = \ +service_version_multiwatch_manager_SOURCES = \ service-version-values.h \ service-version-multiwatch-manager.c @@ -386,7 +386,7 @@ service_version_multiwatch_manager_LDADD = \ check_PROGRAMS += service-version-multiwatch-manager-impolite -service_version_manager_impolite_SOURCES = \ +service_version_multiwatch_manager_impolite_SOURCES = \ service-version-values.h \ service-version-multiwatch-manager-impolite.c -- cgit v1.2.3 From b1beb2ccbcc04f6615b75375821c51ef4828ee24 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 11 Jul 2012 13:07:44 -0500 Subject: bump version to 12.10.0 --- NEWS | 14 ++++++++++++++ configure.ac | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index e69de29..a3fadf7 100644 --- a/NEWS +++ b/NEWS @@ -0,0 +1,14 @@ +12.10.0 + + - merge lp:~evgeni/libindicator/multiarch-same-devheaders so that we + don't include build-time filenames in comments of the enum header + files. If we do, the header files may be different on each build. + This is especially harmful when building multiple times for multiple + architectures and expecting the files to be identical. + + - merge lp:~charlesk/libindicator/fix-test-sources to fix a + copy-and-paste error in specifying the tests' source files + + - merge lp:~charlesk/libindicator/cxx to constify the constructors + for indicator_service_manager + diff --git a/configure.ac b/configure.ac index 4eaa3ac..fd14287 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_INIT([libindicator], - [0.5.0], + [12.10.0], [http://bugs.launchpad.net/libindicator], [libindicator], [http://launchpad.net/libindicator]) -- cgit v1.2.3