code cleanup

diff --git a/src/cbhm_main.c b/src/cbhm_main.c
index b5377f3..3f1bf41 100644 (file)
--- a/src/cbhm_main.c
+++ b/src/cbhm_main.c
@@ -108,8 +108,6 @@ static int init(struct appdata *ad)
        xcnp_init(ad);
        init_appview(ad);
 
-//     clipdrawer_lower_view(ad);
-
        return 0;
 }
 

diff --git a/src/cbhm_main.h b/src/cbhm_main.h
index d3ae688..fac4932 100755 (executable)
--- a/src/cbhm_main.h
+++ b/src/cbhm_main.h
@@ -3,7 +3,7 @@
 
 #include <Elementary.h>
 
-#define APPNAME "cbhm"
+#define APPNAME "Clipboard History Manager"
 #define LOCALEDIR "/usr/share/locale"
 
 #define EDJ_PATH "/usr/share/edje"

diff --git a/src/clipdrawer.c b/src/clipdrawer.c
index 4c3fc88..523ffe5 100644 (file)
--- a/src/clipdrawer.c
+++ b/src/clipdrawer.c
@@ -1,11 +1,8 @@
 #include "common.h"
-#include "clipdrawer.h"
 #include "cbhm_main.h"
 #include "storage.h"
-
-#ifndef _EDJ
-#define _EDJ(ly) elm_layout_edje_get(ly)
-#endif
+#include "xcnphandler.h"
+#include "clipdrawer.h"
 
 #define IM     "/mnt/ums/Images/Photo/"
 static const char *images[] = {
@@ -82,7 +79,7 @@ int clipdrawer_update_contents(void *data)
        return 0;
 }
 
-static int clipdrawer_init(void *data)
+int clipdrawer_init(void *data)
 {
        struct appdata *ad = data;
 

diff --git a/src/clipdrawer.h b/src/clipdrawer.h
index 13760df..6e98dba 100644 (file)
--- a/src/clipdrawer.h
+++ b/src/clipdrawer.h
@@ -1,10 +1,11 @@
 #ifndef _clipdrawer_h_
 #define _clipdrawer_h_
 
-static int clipdrawer_init();
+int clipdrawer_init(void *data);
 int clipdrawer_update_contents(void *data);
-int clipdrawer_create_view();
-void clipdrawer_activate_view();
+int clipdrawer_create_view(void *data);
+void clipdrawer_activate_view(void *data);
 void clipdrawer_hide_view(void *data);
+void clipdrawer_lower_view(void *data);
 
 #endif // _clipdrawer_h_