This email list is read-only. Emails sent to this list will be discarded
----------------------------------
common/client.c | 2 +-
common/common.h | 4 ++--
configure.ac | 47 +++++++++++++++++++++++++++++++++++++++++++++++
configure.in | 47 -----------------------------------------------
4 files changed, 50 insertions(+), 50 deletions(-)
New commits:
commit f4ce076e70ae4db36b2881203a5792bb31fd2844
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Wed Jul 30 19:01:33 2008 +0200
Use org.moblin.connman for service name
commit 4a792e94bbe7d6e2ae6f39d97bdd475861f60ab7
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Wed Jul 30 18:57:05 2008 +0200
Use configure.ac as it is the preferred name
Diff in this email is a maximum of 400 lines.
diff --git a/common/client.c b/common/client.c
index 69aa7ac..0ead612 100644
--- a/common/client.c
+++ b/common/client.c
@@ -588,7 +588,7 @@ static void add_interface(DBusGProxy *manager, const char
*path)
cont = gtk_tree_model_iter_next(model, &iter);
}
- proxy = dbus_g_proxy_new_from_proxy(manager, CONNMAN_INTERFACE, path);
+ proxy = dbus_g_proxy_new_from_proxy(manager, CONNMAN_ELEMENT, path);
gtk_tree_store_insert_with_values(store, &iter, NULL, -1,
CLIENT_COLUMN_ACTIVE, TRUE,
diff --git a/common/common.h b/common/common.h
index a7c5956..f7f0a1e 100644
--- a/common/common.h
+++ b/common/common.h
@@ -19,7 +19,7 @@
*
*/
-#define CONNMAN_SERVICE "org.freedesktop.connman"
+#define CONNMAN_SERVICE "org.moblin.connman"
#define CONNMAN_INSTANCE CONNMAN_SERVICE ".Instance"
#define CONNMAN_MANAGER CONNMAN_SERVICE ".Manager"
-#define CONNMAN_INTERFACE CONNMAN_SERVICE ".Interface"
+#define CONNMAN_ELEMENT CONNMAN_SERVICE ".Element"
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..db0d951
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,47 @@
+AC_PREREQ(2.50)
+AC_INIT()
+
+AM_INIT_AUTOMAKE(connman-gnome, 0.0)
+AM_CONFIG_HEADER(config.h)
+
+AM_MAINTAINER_MODE
+
+AC_PREFIX_DEFAULT(/usr/local)
+
+if (test "${CFLAGS}" = ""); then
+ CFLAGS="-Wall -O2 -D_FORTIFY_SOURCE=2"
+fi
+
+AC_DEFINE_UNQUOTED(LOCALEDIR, "${prefix}/share/locale",
+ [Directory for the localization files])
+
+AC_LANG_C
+
+AC_PROG_CC
+AC_PROG_CC_PIE
+AC_PROG_INSTALL
+AC_PROG_RANLIB
+
+GETTEXT_PACKAGE=connman
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
+ [The name of the gettext domain])
+
+AM_GLIB_GNU_GETTEXT
+IT_PROG_INTLTOOL([0.35.0])
+
+PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.70, dummy=yes,
+ AC_MSG_ERROR(dbus-glib > = 0.70 is required))
+AC_SUBST(DBUS_CFLAGS)
+AC_SUBST(DBUS_LIBS)
+
+DBUS_BINDING_TOOL="dbus-binding-tool"
+AC_SUBST(DBUS_BINDING_TOOL)
+
+PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.12, dummy=yes,
+ AC_MSG_ERROR(gtk+ >= 2.12 is required))
+AC_SUBST(GTK_CFLAGS)
+AC_SUBST(GTK_LIBS)
+
+AC_OUTPUT(Makefile common/Makefile applet/Makefile properties/Makefile
+ icons/Makefile po/Makefile.in)
diff --git a/configure.in b/configure.in
deleted file mode 100644
index db0d951..0000000
--- a/configure.in
+++ /dev/null
@@ -1,47 +0,0 @@
-AC_PREREQ(2.50)
-AC_INIT()
-
-AM_INIT_AUTOMAKE(connman-gnome, 0.0)
-AM_CONFIG_HEADER(config.h)
-
-AM_MAINTAINER_MODE
-
-AC_PREFIX_DEFAULT(/usr/local)
-
-if (test "${CFLAGS}" = ""); then
- CFLAGS="-Wall -O2 -D_FORTIFY_SOURCE=2"
-fi
-
-AC_DEFINE_UNQUOTED(LOCALEDIR, "${prefix}/share/locale",
- [Directory for the localization files])
-
-AC_LANG_C
-
-AC_PROG_CC
-AC_PROG_CC_PIE
-AC_PROG_INSTALL
-AC_PROG_RANLIB
-
-GETTEXT_PACKAGE=connman
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
- [The name of the gettext domain])
-
-AM_GLIB_GNU_GETTEXT
-IT_PROG_INTLTOOL([0.35.0])
-
-PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.70, dummy=yes,
- AC_MSG_ERROR(dbus-glib > = 0.70 is required))
-AC_SUBST(DBUS_CFLAGS)
-AC_SUBST(DBUS_LIBS)
-
-DBUS_BINDING_TOOL="dbus-binding-tool"
-AC_SUBST(DBUS_BINDING_TOOL)
-
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.12, dummy=yes,
- AC_MSG_ERROR(gtk+ >= 2.12 is required))
-AC_SUBST(GTK_CFLAGS)
-AC_SUBST(GTK_LIBS)
-
-AC_OUTPUT(Makefile common/Makefile applet/Makefile properties/Makefile
- icons/Makefile po/Makefile.in)
_______________________________________________
Commits mailing list
[email protected]
https://www.moblin.org/mailman/listinfo/commits
