Remove leftover '-glib' suffixes to ytstenut name.

5 files changed, 27 insertions, 28 deletions

diff --git a/.gitignore b/.gitignore
index 65d91b6..7df2af0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,7 +19,7 @@ config.status
 config.sub
 configure
 depcomp
-docs/reference/ytstenut-glib/ytstenut-glib-docs.xml
+docs/reference/ytstenut/ytstenut-docs.xml
 *decl-list.txt
 *decl.txt
 *undeclared.txt
@@ -40,17 +40,17 @@ missing
 omf.make
 stamp-h1
 xmldocs.make
-Ytsg-1.0.gir
-Ytsg-1.0.typelib
-Ytstenut-glib-1.0.gir
+Yts-1.0.gir
+Yts-1.0.typelib
+Ytstenut-1.0.gir
 stamp-marshal.h
-stamp-ytsg-enum-types.h
+stamp-yts-enum-types.h
 tmp-introspect*
-ytsg-enum-types.c
-ytsg-enum-types.h
-ytsg-marshal.c
-ytsg-marshal.h
-ytsg-status.c
-ytsg-status.h
-ytsg-version.h
-ytstenut-glib.pc
+yts-enum-types.c
+yts-enum-types.h
+yts-marshal.c
+yts-marshal.h
+yts-status.c
+yts-status.h
+yts-version.h
+ytstenut-1.pc
diff --git a/TODO b/TODO
index 0959705..ef66150 100644
--- a/TODO
+++ b/TODO
@@ -13,7 +13,6 @@ TODO
 * YtsService should maybe be YtsRemoteService.
 * The pc file name should contain the API version.
 * Look at using xml-rpc
-* Globally rename "com.meego.xpmn.ytstenut" to "org.freedesktop.ytstenut".
 * It probably doesn't work when capabilities are added after connecting the client. Fix it.
 * Publish capabilities in "names", instead of using the profile as UID.
 * Implement generic service proxy and replace MetadataService with it.
diff --git a/docs/reference/ytstenut/ytstenut-docs.xml.in b/docs/reference/ytstenut/ytstenut-docs.xml.in
index 63702fb..0843b00 100644
--- a/docs/reference/ytstenut/ytstenut-docs.xml.in
+++ b/docs/reference/ytstenut/ytstenut-docs.xml.in
@@ -6,7 +6,7 @@
 
 <book id="yts" xmlns:xi="http://www.w3.org/2003/XInclude">
   <bookinfo>
-    <title>Ytstenut-glib</title>
+    <title>Ytstenut</title>
     <releaseinfo>For ytstenut &version;</releaseinfo>
 
     <copyright>
@@ -44,7 +44,7 @@
     <title>Reference</title>
 
     <chapter id="yts-classes">
-      <title>Ytstenut-glib Objects</title>
+      <title>Ytstenut Objects</title>
 
       <xi:include href="xml/yts-types.xml"/>
       <xi:include href="xml/yts-error.xml"/>
diff --git a/ytstenut/yts-main.c b/ytstenut/yts-main.c
index 317237d..f8a974d 100644
--- a/ytstenut/yts-main.c
+++ b/ytstenut/yts-main.c
@@ -105,9 +105,9 @@ static GOptionEntry yts_args[] = {
     N_("Make all warnings fatal"), NULL },
 #ifdef YTS_ENABLE_DEBUG
   { "yts-debug", 0, 0, G_OPTION_ARG_CALLBACK, yts_arg_debug_cb,
-    N_("Ytstenut-glib debugging flags to set"), "FLAGS" },
+    N_("Ytstenut debugging flags to set"), "FLAGS" },
   { "yts-no-debug", 0, 0, G_OPTION_ARG_CALLBACK, yts_arg_no_debug_cb,
-    N_("Ytstenut-glib debugging flags to unset"), "FLAGS" },
+    N_("Ytstenut debugging flags to unset"), "FLAGS" },
 #endif /* YTS_ENABLE_DEBUG */
   { NULL, },
 };
@@ -176,12 +176,12 @@ post_parse_hook (GOptionContext  *context,
  * yts_get_option_group:
  *
  * Returns a #GOptionGroup for the command line arguments recognized
- * by Ytstenut-Glib. You should add this group to your #GOptionContext with
+ * by Ytstenut. You should add this group to your #GOptionContext with
  * g_option_context_add_group(), if you are using g_option_context_parse()
  * to parse your commandline arguments.
  *
- * Calling g_option_context_parse() with Ytstenut-Glib's #GOptionGroup will
- * result in Ytstenut-Glib's initialization. That is, the following code:
+ * Calling g_option_context_parse() with Ytstenut's #GOptionGroup will
+ * result in Ytstenut's initialization. That is, the following code:
  *
  * |[
  *   g_option_context_set_main_group (context, yts_get_option_group ());
@@ -195,11 +195,11 @@ post_parse_hook (GOptionContext  *context,
  * ]|
  *
  * After g_option_context_parse() on a #GOptionContext containing the
- * Ytstenut-Glib #GOptionGroup has returned %TRUE, Ytstenut-Glib is guaranteed
+ * Ytstenut #GOptionGroup has returned %TRUE, Ytstenut is guaranteed
  * to be initialized.
  *
  * Return value: (transfer full): a #GOptionGroup for the commandline arguments
- *   recognized by Ytstenut-Glib
+ *   recognized by Ytstenut
  *
  * Since: 0.1
  */
@@ -210,9 +210,9 @@ yts_get_option_group (void)
 
   yts_base_init ();
 
-  group = g_option_group_new ("Ytstenut-glib",
-                              _("Ytstenut-glib Options"),
-                              _("Show Ytstenut-glib Options"),
+  group = g_option_group_new ("Ytstenut",
+                              _("Ytstenut Options"),
+                              _("Show Ytstenut Options"),
                               NULL,
                               NULL);
 
@@ -353,7 +353,7 @@ yts_parse_args (int *argc, char ***argv)
  * @argv: (array length=argc) (inout) (allow-none): A pointer to an array
  *   of arguments.
  *
- * Initialises Ytstenut-glib library.
+ * Initialises Ytstenut library.
  *
  * Return value: 1 on success, < 0 on failure.
  */
diff --git a/ytstenut/yts-types.h b/ytstenut/yts-types.h
index ce6f039..f3e3d2a 100644
--- a/ytstenut/yts-types.h
+++ b/ytstenut/yts-types.h
@@ -24,7 +24,7 @@
  * @title: Common Types
  * @section_id: yts-types
  *
- * Common Ytstenut-glib types
+ * Common Ytstenut types
  */
 
 #ifndef YTS_TYPES_H