[next] telepathy-glib: Rename the Logger's GIR to TelepathyLogger-1

Simon McVittie smcv at kemper.freedesktop.org
Tue Jan 7 07:47:13 PST 2014


Module: telepathy-glib
Branch: next
Commit: 9ec6e88a3da0a45ecef43257f9dff19537a350b8
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=9ec6e88a3da0a45ecef43257f9dff19537a350b8

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Tue Nov 12 12:46:31 2013 +0000

Rename the Logger's GIR to TelepathyLogger-1

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=49737
Reviewed-by: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>

---

 .gitignore                     |    4 ++--
 telepathy-logger/Makefile.am   |   18 +++++++++---------
 telepathy-logger/log-manager.c |    8 ++++----
 telepathy-logger/log-walker.c  |    2 +-
 telepathy-logger/text-event.c  |    2 +-
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 776dd86..bf24ee6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -116,8 +116,8 @@ telepathy-glib/version.h
 /telepathy-logger/test-api
 /telepathy-logger/telepathy-logger-1-uninstalled.pc
 /telepathy-logger/telepathy-logger-1.pc
-/telepathy-logger/TelepathyLogger1-1.typelib
-/telepathy-logger/TelepathyLogger1-1.gir
+/telepathy-logger/TelepathyLogger-1.typelib
+/telepathy-logger/TelepathyLogger-1.gir
 /telepathy-logger/_gen/
 /telepathy-logger/tpl-marshal.[ch]
 /test-driver
diff --git a/telepathy-logger/Makefile.am b/telepathy-logger/Makefile.am
index c6d81bb..774bd21 100644
--- a/telepathy-logger/Makefile.am
+++ b/telepathy-logger/Makefile.am
@@ -144,23 +144,23 @@ CLEANFILES = $(BUILT_SOURCES)
 if HAVE_INTROSPECTION
 introspection_sources = $(libtelepathy_logger_1_la_SOURCES) $(LIBTPL_HEADERS)
 
-TelepathyLogger1-1.gir: libtelepathy-logger-1.la
-TelepathyLogger1_1_gir_SCANNERFLAGS = --identifier-prefix=Tpl --warn-all
-TelepathyLogger1_1_gir_INCLUDES = GObject-2.0 TelepathyGLib-1
-TelepathyLogger1_1_gir_CFLAGS = $(INCLUDES)
-TelepathyLogger1_1_gir_LIBS = libtelepathy-logger-1.la
-TelepathyLogger1_1_gir_FILES = $(filter-out %-internal.h, $(introspection_sources))
-TelepathyLogger1_1_gir_PACKAGES = \
+TelepathyLogger-1.gir: libtelepathy-logger-1.la
+TelepathyLogger_1_gir_SCANNERFLAGS = --identifier-prefix=Tpl --warn-all
+TelepathyLogger_1_gir_INCLUDES = GObject-2.0 TelepathyGLib-1
+TelepathyLogger_1_gir_CFLAGS = $(INCLUDES)
+TelepathyLogger_1_gir_LIBS = libtelepathy-logger-1.la
+TelepathyLogger_1_gir_FILES = $(filter-out %-internal.h, $(introspection_sources))
+TelepathyLogger_1_gir_PACKAGES = \
 	glib-2.0 \
 	gobject-2.0 \
 	gio-2.0 \
 	telepathy-glib-1 \
 	$(NULL)
-TelepathyLogger1_1_gir_EXPORT_PACKAGES = \
+TelepathyLogger_1_gir_EXPORT_PACKAGES = \
 	telepathy-logger-1 \
 	$(NULL)
 
-INTROSPECTION_GIRS += TelepathyLogger1-1.gir
+INTROSPECTION_GIRS += TelepathyLogger-1.gir
 
 INTROSPECTION_SCANNER_ENV = \
 	PKG_CONFIG_PATH=$(builddir):$(top_builddir)/telepathy-glib:$${PKG_CONFIG_PATH}
diff --git a/telepathy-logger/log-manager.c b/telepathy-logger/log-manager.c
index 4983ee1..95ebeb7 100644
--- a/telepathy-logger/log-manager.c
+++ b/telepathy-logger/log-manager.c
@@ -1104,7 +1104,7 @@ tpl_log_manager_get_events_for_date_async (TplLogManager *manager,
  * tpl_log_manager_get_events_for_date_finish:
  * @self: a #TplLogManager
  * @result: a #GAsyncResult
- * @events: (out) (transfer full) (element-type TelepathyLogger1.Event): a
+ * @events: (out) (transfer full) (element-type TelepathyLogger.Event): a
  *  pointer to a #GList used to return the list of #TplEvent
  * @error: a #GError to fill
  *
@@ -1220,7 +1220,7 @@ tpl_log_manager_get_filtered_events_async (TplLogManager *manager,
  * tpl_log_manager_get_filtered_events_finish:
  * @self: a #TplLogManager
  * @result: a #GAsyncResult
- * @events: (out) (transfer full) (element-type TelepathyLogger1.Event):
+ * @events: (out) (transfer full) (element-type TelepathyLogger.Event):
  *  a pointer to a #GList used to return the list #TplEvent
  * @error: a #GError to fill
  *
@@ -1360,7 +1360,7 @@ tpl_log_manager_get_entities_async (TplLogManager *self,
  * tpl_log_manager_get_entities_finish:
  * @self: a #TplLogManager
  * @result: a #GAsyncResult
- * @entities: (out) (transfer full) (element-type TelepathyLogger1.Entity): a
+ * @entities: (out) (transfer full) (element-type TelepathyLogger.Entity): a
  *  pointer to a #GList used to return the list of #TplEntity, to be freed
  *  using something like g_list_free_full (lst, g_object_unref)
  * @error: a #GError to fill
@@ -1459,7 +1459,7 @@ tpl_log_manager_search_async (TplLogManager *manager,
  * tpl_log_manager_search_finish:
  * @self: a #TplLogManager
  * @result: a #GAsyncResult
- * @hits: (out) (transfer full) (element-type TelepathyLogger1.LogSearchHit): a
+ * @hits: (out) (transfer full) (element-type TelepathyLogger.LogSearchHit): a
  *  pointer to a #GList used to return the list of #TplLogSearchHit
  * @error: a #GError to fill
  *
diff --git a/telepathy-logger/log-walker.c b/telepathy-logger/log-walker.c
index f4763e1..e5b3a77 100644
--- a/telepathy-logger/log-walker.c
+++ b/telepathy-logger/log-walker.c
@@ -816,7 +816,7 @@ tpl_log_walker_get_events_async (TplLogWalker *walker,
  * tpl_log_walker_get_events_finish:
  * @walker: a #TplLogWalker
  * @result: a #GAsyncResult
- * @events: (out) (transfer full) (element-type TelepathyLogger1.Event):
+ * @events: (out) (transfer full) (element-type TelepathyLogger.Event):
  *  a pointer to a #GList used to return the list #TplEvent
  * @error: a #GError to fill
  *
diff --git a/telepathy-logger/text-event.c b/telepathy-logger/text-event.c
index 4ef6923..5694f33 100644
--- a/telepathy-logger/text-event.c
+++ b/telepathy-logger/text-event.c
@@ -366,7 +366,7 @@ _tpl_text_event_add_supersedes (TplTextEvent *self,
  * tpl_text_event_get_supersedes:
  * @self: a #TplTextEvent
  *
- * Returns: (transfer none) (element-type TelepathyLogger1.TextEvent): A #GList
+ * Returns: (transfer none) (element-type TelepathyLogger.TextEvent): A #GList
  *  of #TplTextEvent that this event
  * supersedes.
  */



More information about the telepathy-commits mailing list