diff options
author | Kiseok Chang <kiso.chang@samsung.com> | 2018-04-12 19:22:58 +0900 |
---|---|---|
committer | Kiseok Chang <kiso.chang@samsung.com> | 2018-04-12 19:24:31 +0900 |
commit | fbad7d145690526788d59b544eb3f6b1b5fc5a08 (patch) | |
tree | 3e5d7ab72a1c0beeb9cc053e105d90be5dbb31f6 | |
parent | c922bc7a8058fab26d5f056bdd94db3c808d1220 (diff) | |
download | factory-reset-fbad7d145690526788d59b544eb3f6b1b5fc5a08.tar.gz factory-reset-fbad7d145690526788d59b544eb3f6b1b5fc5a08.tar.bz2 factory-reset-fbad7d145690526788d59b544eb3f6b1b5fc5a08.zip |
Remove dependency on dbus-glib-1submit/tizen/20180413.004809accepted/tizen/unified/20180416.213918
Change-Id: I80d38697c2fc9a5e3014fb351311b91aecc82c85
Signed-off-by: Kiseok Chang <kiso.chang@samsung.com>
-rwxr-xr-x[-rw-r--r--] | CMakeLists.txt | 2 | ||||
-rwxr-xr-x | packaging/factory-reset.spec | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | src/factory-reset.c | 14 |
3 files changed, 15 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a18208b..0f22d70 100644..100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ SET(SRCS src/factory-reset.c) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) INCLUDE(FindPkgConfig) -pkg_check_modules(pkgs REQUIRED libsmack dbus-1 dbus-glib-1 ${PKG_MODULES} ) +pkg_check_modules(pkgs REQUIRED libsmack dbus-1 glib-2.0 ${PKG_MODULES} ) FOREACH(flag ${pkgs_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") diff --git a/packaging/factory-reset.spec b/packaging/factory-reset.spec index 545429e..a98e725 100755 --- a/packaging/factory-reset.spec +++ b/packaging/factory-reset.spec @@ -12,7 +12,7 @@ ExclusiveArch: %{arm} BuildRequires: cmake BuildRequires: pkgconfig(libsmack) BuildRequires: pkgconfig(dbus-1) -BuildRequires: pkgconfig(dbus-glib-1) +BuildRequires: pkgconfig(glib-2.0) Requires: util-linux Requires: zip diff --git a/src/factory-reset.c b/src/factory-reset.c index 0828b85..aee4d59 100644..100755 --- a/src/factory-reset.c +++ b/src/factory-reset.c @@ -31,7 +31,12 @@ #include <getopt.h> #include <dbus/dbus.h> #include <glib.h> + +//#define _USE_DBUS_OPTION + +#ifdef _USE_DBUS_OPTION #include <dbus/dbus-glib-lowlevel.h> +#endif #define RESET_FLAG_FILE "/opt/.factoryreset" static const char RESET_BACKUP_FILE[2][40] = { @@ -98,6 +103,9 @@ int __system(const char *argv[]) } + +#ifdef _USE_DBUS_OPTION + #define RESET_DBUS_SERVICE "org.tizen.factoryreset" #define RESET_DBUS_INTERFACE RESET_DBUS_SERVICE".start" @@ -130,6 +138,7 @@ static DBusHandlerResult message_func(DBusConnection *connection, void *user_data) { /* store the name of factory reset caller. */ + char caller_name[NAME_MAX]; FILE *fp = NULL; int i = 0; @@ -241,6 +250,8 @@ static int process_dbus(void) } +#endif // _USE_DBUS_OPTION + int main(int argc, char **argv) { FILE *fp; @@ -289,11 +300,12 @@ int main(int argc, char **argv) switch (c) { case 'b': - +#ifdef _USE_DBUS_OPTION if (process_dbus() < 0) { perror("dbus has some errors."); return -1; } +#endif break; default: |