Rename Moblin plugin to MeeGo features plugin

diff --git a/Makefile.am b/Makefile.am
index 9276e20..c540378 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -176,7 +176,7 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-gtk-doc \
                                --enable-resolvconf \
                                --enable-dnsproxy \
                                --enable-google \
-                               --enable-moblin \
+                               --enable-meego \
                                --enable-hso \
                                --enable-mbm \
                                --enable-udev \

diff --git a/Makefile.plugins b/Makefile.plugins
index 2406327..4b73cfa 100644 (file)
--- a/Makefile.plugins
+++ b/Makefile.plugins
@@ -192,15 +192,15 @@ plugins_google_la_LDFLAGS = $(plugin_ldflags)
 endif
 endif
 
-if MOBLIN
-if MOBLIN_BUILTIN
-builtin_modules += moblin
-builtin_sources += plugins/moblin.c
+if MEEGO
+if MEEGO_BUILTIN
+builtin_modules += meego
+builtin_sources += plugins/meego.c
 else
-plugin_LTLIBRARIES += plugins/moblin.la
-plugin_objects += $(plugins_moblin_la_OBJECTS)
-plugins_moblin_la_CFLAGS = $(plugin_cflags)
-plugins_moblin_la_LDFLAGS = $(plugin_ldflags)
+plugin_LTLIBRARIES += plugins/meego.la
+plugin_objects += $(plugins_meego_la_OBJECTS)
+plugins_meego_la_CFLAGS = $(plugin_cflags)
+plugins_meego_la_LDFLAGS = $(plugin_ldflags)
 endif
 endif
 

diff --git a/bootstrap-configure b/bootstrap-configure
index 74e8030..8a6ce89 100755 (executable)
--- a/bootstrap-configure
+++ b/bootstrap-configure
@@ -27,7 +27,7 @@ fi
                --enable-resolvconf=builtin \
                --enable-dnsproxy=builtin \
                --enable-google=builtin \
-               --enable-moblin=builtin \
+               --enable-meego=builtin \
                --enable-hso=builtin \
                --enable-mbm=builtin \
                --enable-iwmx \

diff --git a/configure.ac b/configure.ac
index 96872dc..cdb3a07 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -185,11 +185,11 @@ AC_ARG_ENABLE(google,
 AM_CONDITIONAL(GOOGLE, test "${enable_google}" != "no")
 AM_CONDITIONAL(GOOGLE_BUILTIN, test "${enable_google}" = "builtin")
 
-AC_ARG_ENABLE(moblin,
-       AC_HELP_STRING([--enable-moblin], [enable Moblin features support]),
-                       [enable_moblin=${enableval}], [enable_moblin="no"])
-AM_CONDITIONAL(MOBLIN, test "${enable_moblin}" != "no")
-AM_CONDITIONAL(MOBLIN_BUILTIN, test "${enable_moblin}" = "builtin")
+AC_ARG_ENABLE(meego,
+       AC_HELP_STRING([--enable-meego], [enable MeeGo features support]),
+                       [enable_meego=${enableval}], [enable_meego="no"])
+AM_CONDITIONAL(MEEGO, test "${enable_meego}" != "no")
+AM_CONDITIONAL(MEEGO_BUILTIN, test "${enable_meego}" = "builtin")
 
 AC_ARG_ENABLE(hso,
        AC_HELP_STRING([--enable-hso], [enable HSO support]),

diff --git a/plugins/moblin.c b/plugins/meego.c
similarity index 83%
rename from plugins/moblin.c
rename to plugins/meego.c
index 7b346c6..49978fa 100644 (file)
--- a/plugins/moblin.c
+++ b/plugins/meego.c
@@ -26,14 +26,14 @@
 #define CONNMAN_API_SUBJECT_TO_CHANGE
 #include <connman/plugin.h>
 
-static int moblin_init(void)
+static int meego_init(void)
 {
        return 0;
 }
 
-static void moblin_exit(void)
+static void meego_exit(void)
 {
 }
 
-CONNMAN_PLUGIN_DEFINE(moblin, "Moblin features plugin", VERSION,
-                       CONNMAN_PLUGIN_PRIORITY_LOW, moblin_init, moblin_exit)
+CONNMAN_PLUGIN_DEFINE(meego, "MeeGo features plugin", VERSION,
+                       CONNMAN_PLUGIN_PRIORITY_LOW, meego_init, meego_exit)