code clean up

diff --git a/src/cbhm_main.c b/src/cbhm_main.c
index 0e588ea..2d46be6 100644 (file)
--- a/src/cbhm_main.c
+++ b/src/cbhm_main.c
@@ -10,12 +10,6 @@
  * you entered into with Samsung Electronics.
  */
 
-#include <stdio.h>
-#include <Elementary.h>
-#include <Ecore_X.h>
-#include <utilX.h>
-//#include <appcore-efl.h>
-
 #include "common.h"
 #include "cbhm_main.h"
 #include "xcnphandler.h"

diff --git a/src/common.h b/src/common.h
index f792d4d..8b5c002 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -8,6 +8,11 @@
 #include <time.h>
 #include <sys/time.h>
 
+#include <Elementary.h>
+#include <Ecore_X.h>
+#include <utilX.h>
+//#include <appcore-efl.h>
+
 #ifndef _EDJ
 #define _EDJ(ly) elm_layout_edje_get(ly)
 #endif

diff --git a/src/xcnphandler.c b/src/xcnphandler.c
index 8deada5..d84af04 100755 (executable)
--- a/src/xcnphandler.c
+++ b/src/xcnphandler.c
@@ -77,6 +77,7 @@ static int _init_atoms()
        atomInc = XInternAtom(g_disp, "INCR", False);
        atomTargets = XInternAtom(g_disp, "TARGETS", False);
        atomUTF8String = XInternAtom(g_disp, "UTF8_STRING", False);
+       atomHtmltext = XInternAtom(g_disp, "text/html;charset=utf-8", False);
 
        return TRUE;
 }
@@ -251,15 +252,14 @@ int processing_selection_request(Ecore_X_Event_Selection_Request *ev)
 
        DTRACE("## wanted target = %d\n", ev->target);
        DTRACE("## wanted target = %s\n", XGetAtomName(g_disp, ev->target));
+       DTRACE("## req target atom name = %s\n", XGetAtomName(g_disp, ev->target));
 
        /* TODO : if there are request which cbhm doesn't understand,
           then reply None property to requestor */
        if (ev->target == atomTargets) 
        {
 //        Atom types[2] = { atomTargets, atomUTF8String };
-               Atom atomHtml = XInternAtom(g_disp, "text/html;charset=utf-8", False);
-
-        Atom types[3] = { atomTargets, atomUTF8String, atomHtml };
+        Atom types[3] = { atomTargets, atomUTF8String, atomHtmltext };
 
         // send all (not using INCR) 
         XChangeProperty(g_disp, req_win, req_atom, XA_ATOM,

diff --git a/src/xcnphandler.h b/src/xcnphandler.h
index 6c395d9..ae6bf34 100755 (executable)
--- a/src/xcnphandler.h
+++ b/src/xcnphandler.h
@@ -57,6 +57,7 @@ static Atom atomCBOut;
 static Atom atomInc;
 static Atom atomTargets;
 static Atom atomUTF8String;
+static Atom atomHtmltext;
 
 #endif //_xcnphandler_h_