From afe1d03e8772f3c7c53517052a641322f593ae4b Mon Sep 17 00:00:00 2001
From: Mike McCormack <mj.mccormack@samsung.com>
Date: Tue, 8 Nov 2011 17:26:49 +0900
Subject: [PATCH] Remove unnecessary differences with upstream

---
 src/lib/elm_button.c     | 12 ++++--------
 src/lib/elm_cnp_helper.c | 22 ++++++++++++----------
 src/lib/elm_entry.c      | 38 +++++++++++++++++++-------------------
 3 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c
index 242568b..084d165 100644
--- a/src/lib/elm_button.c
+++ b/src/lib/elm_button.c
@@ -1,10 +1,6 @@
 #include <Elementary.h>
 #include "elm_priv.h"
 
-/**
- * @ingroup Elementary
- */
-
 typedef struct _Widget_Data Widget_Data;
 
 enum
@@ -112,15 +108,15 @@ _on_focus_hook(void *data __UNUSED__, Evas_Object *obj)
           {
              _set_label(obj, wd->statelabel[FOCUSED]);
           }
-   edje_object_signal_emit(wd->btn, "elm,action,focus", "elm");
-   evas_object_focus_set(wd->btn, EINA_TRUE);
+        edje_object_signal_emit(wd->btn, "elm,action,focus", "elm");
+        evas_object_focus_set(wd->btn, EINA_TRUE);
      }
    else
      {
         if (wd->statelabel[DEFAULT])
           _set_label(obj, wd->statelabel[DEFAULT]);
-   edje_object_signal_emit(wd->btn, "elm,action,unfocus", "elm");
-   evas_object_focus_set(wd->btn, EINA_FALSE);
+        edje_object_signal_emit(wd->btn, "elm,action,unfocus", "elm");
+        evas_object_focus_set(wd->btn, EINA_FALSE);
      }
 }
 
diff --git a/src/lib/elm_cnp_helper.c b/src/lib/elm_cnp_helper.c
index ad9a51f..59554ca 100644
--- a/src/lib/elm_cnp_helper.c
+++ b/src/lib/elm_cnp_helper.c
@@ -168,14 +168,14 @@ static void entry_insert_filter(Evas_Object* entry, char* str);
 /* Optimisation: Turn this into a 256 byte table:
  *	then can lookup in one index, not N checks */
 static const Escape escapes[] = {
-       { "<br>",   '\n' },
-       { "<ps>",   '\n' },
-       { "<\t>",   '\t' },
-       { "gt;",    '>'  },
-       { "lt;",    '<'  },
-       { "amp;",   '&'  },
-       { "quot;",  '\'' },
-       { "dquot;", '"'  }
+  { "<br>",   '\n' },
+  { "<ps>",   '\n' },
+  { "<\t>",   '\t' },
+  { "gt;",    '>'  },
+  { "lt;",    '<'  },
+  { "amp;",   '&'  },
+  { "quot;",  '\'' },
+  { "dquot;", '"'  }
 };
 #define N_ESCAPES ((int)(sizeof(escapes) / sizeof(escapes[0])))
 
@@ -1461,11 +1461,13 @@ notify_handler_targets(Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *notif
           {
              if ((atoms[j].atom == atomlist[i]) && (atoms[j].notify))
                {
-/*                  if ((j == CNP_ATOM_text_uri) ||
+#if 0
+                  if ((j == CNP_ATOM_text_uri) ||
                       (j == CNP_ATOM_text_urilist))
                     {
                       if(!is_uri_type_data(sel, notify)) continue;
-                    }*/
+                    }
+#endif
                   cnp_debug("Atom %s matches\n",atoms[j].name);
                   goto done;
                }
diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index bdff80b..0926a34 100644
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -179,25 +179,25 @@ static const char SIG_ANCHOR_CLICKED[] = "anchor,clicked";
 static const char SIG_MATCHLIST_CLICKED[] = "matchlist,clicked";
 static const char SIG_PREEDIT_CHANGED[] = "preedit,changed";
 static const Evas_Smart_Cb_Description _signals[] = {
-  {SIG_CHANGED, ""},
-  {SIG_ACTIVATED, ""},
-  {SIG_PRESS, ""},
-  {SIG_LONGPRESSED, ""},
-  {SIG_CLICKED, ""},
-  {SIG_CLICKED_DOUBLE, ""},
-  {SIG_FOCUSED, ""},
-  {SIG_UNFOCUSED, ""},
-  {SIG_SELECTION_PASTE, ""},
-  {SIG_SELECTION_COPY, ""},
-  {SIG_SELECTION_CUT, ""},
-  {SIG_SELECTION_START, ""},
-  {SIG_SELECTION_CHANGED, ""},
-  {SIG_SELECTION_CLEARED, ""},
-  {SIG_CURSOR_CHANGED, ""},
-  {SIG_ANCHOR_CLICKED, ""},
-  {SIG_PREEDIT_CHANGED, ""},
-  {SIG_MATCHLIST_CLICKED, ""},
-  {NULL, NULL}
+       {SIG_CHANGED, ""},
+       {SIG_ACTIVATED, ""},
+       {SIG_PRESS, ""},
+       {SIG_LONGPRESSED, ""},
+       {SIG_CLICKED, ""},
+       {SIG_CLICKED_DOUBLE, ""},
+       {SIG_FOCUSED, ""},
+       {SIG_UNFOCUSED, ""},
+       {SIG_SELECTION_PASTE, ""},
+       {SIG_SELECTION_COPY, ""},
+       {SIG_SELECTION_CUT, ""},
+       {SIG_SELECTION_START, ""},
+       {SIG_SELECTION_CHANGED, ""},
+       {SIG_SELECTION_CLEARED, ""},
+       {SIG_CURSOR_CHANGED, ""},
+       {SIG_ANCHOR_CLICKED, ""},
+       {SIG_PREEDIT_CHANGED, ""},
+       {SIG_MATCHLIST_CLICKED, ""},
+       {NULL, NULL}
 };
 
 typedef enum _Elm_Entry_Magnifier_Type
-- 
2.7.4