modified
authorJeonghyun Yun <jh0506.yun@samsung.com>
Thu, 8 Mar 2012 06:35:03 +0000 (15:35 +0900)
committerJeonghyun Yun <jh0506.yun@samsung.com>
Thu, 8 Mar 2012 06:35:03 +0000 (15:35 +0900)
37 files changed:
data/edje_externals/Makefile.am
data/edje_externals/ico_anchorblock.png [deleted file]
data/edje_externals/ico_anchorview.png [deleted file]
data/edje_externals/ico_colorselector.png [moved from data/edje_externals/ico_colorpalette.png with 100% similarity]
data/edje_externals/ico_datetime.png [moved from data/edje_externals/ico_datefield.png with 100% similarity]
data/edje_externals/ico_nocontents.png [deleted file]
data/edje_externals/ico_page_control.png [deleted file]
data/edje_externals/ico_searchbar.png [deleted file]
data/edje_externals/icons.edc
data/images/Makefile.am
data/objects/test.edc
data/themes/Makefile.am
data/themes/default.edc
data/themes/widgets/pager.edc [deleted file]
doc/Makefile.am
doc/examples.dox
doc/index.doxy
doc/widgets/Makefile.am
elementary.spec.in
po/POTFILES.in
po/ar.po
po/az_IR.po
po/cs.po
po/de.po
po/fa.po
po/fr.po
po/he.po
po/it.po
po/ko_KR.po
po/nl.po
po/ps.po
po/pt.po
po/ur.po
po/yi.po
src/lib/elm_cnp_helper.c [deleted file]
src/lib/elm_colorpalette.c [deleted file]
src/lib/elm_colorpalette.h [deleted file]

index b078286..efa6c0e 100644 (file)
@@ -12,15 +12,12 @@ files_DATA = icons.edj
 
 EXTRA_DIST = \
 icons.edc \
-ico_anchorblock.png \
-ico_anchorview.png \
 ico_bubble.png \
 ico_button.png \
 ico_check.png \
 ico_clock.png \
-<<<<<<< HEAD
-ico_colorpalette.png\
-ico_datefield.png \
+ico_colorselector.png\
+ico_datetime.png \
 ico_fileselector.png \
 ico_fileselector_button.png \
 ico_gengrid.png \
@@ -29,25 +26,13 @@ ico_hoversel.png \
 ico_icon.png \
 ico_list.png \
 ico_map.png \
-ico_nocontents.png \
-ico_page_control.png \
-=======
-ico_fileselector.png \
-ico_fileselector_button.png \
-ico_genlist.png \
-ico_hoversel.png \
-ico_list.png \
-ico_map.png \
->>>>>>> remotes/origin/upstream
+ico_multibuttonentry.png \
 ico_notepad.png \
 ico_photocam.png \
 ico_progressbar.png \
 ico_radio.png \
 ico_scrolled_entry.png \
-<<<<<<< HEAD
 ico_scroller.png \
-=======
->>>>>>> remotes/origin/upstream
 ico_slider.png \
 ico_slideshow.png \
 ico_spinner.png \
diff --git a/data/edje_externals/ico_anchorblock.png b/data/edje_externals/ico_anchorblock.png
deleted file mode 100644 (file)
index a62138e..0000000
Binary files a/data/edje_externals/ico_anchorblock.png and /dev/null differ
diff --git a/data/edje_externals/ico_anchorview.png b/data/edje_externals/ico_anchorview.png
deleted file mode 100644 (file)
index 7615015..0000000
Binary files a/data/edje_externals/ico_anchorview.png and /dev/null differ
diff --git a/data/edje_externals/ico_nocontents.png b/data/edje_externals/ico_nocontents.png
deleted file mode 100644 (file)
index 771dac9..0000000
Binary files a/data/edje_externals/ico_nocontents.png and /dev/null differ
diff --git a/data/edje_externals/ico_page_control.png b/data/edje_externals/ico_page_control.png
deleted file mode 100755 (executable)
index b1300d0..0000000
Binary files a/data/edje_externals/ico_page_control.png and /dev/null differ
diff --git a/data/edje_externals/ico_searchbar.png b/data/edje_externals/ico_searchbar.png
deleted file mode 100644 (file)
index 443e4c2..0000000
Binary files a/data/edje_externals/ico_searchbar.png and /dev/null differ
index b50ac03..a766aef 100644 (file)
@@ -10,15 +10,12 @@ collections { group { name: "ico_"_name;                    \
                image.normal: "ico_"_name".png";             \
 }}}}}
 
-ICON("anchorblock")
-ICON("anchorview")
 ICON("bubble")
 ICON("button")
 ICON("check")
 ICON("clock")
-<<<<<<< HEAD
-ICON("colorpalette")
-ICON("datefield")
+ICON("colorselector")
+ICON("datetime")
 ICON("fileselector")
 ICON("fileselector_button")
 ICON("gengrid")
@@ -29,31 +26,14 @@ ICON("list")
 ICON("map")
 ICON("notepad")
 ICON("multibuttonentry")
-ICON("nocontents")
-ICON("page_control")
-=======
-ICON("fileselector")
-ICON("fileselector_button")
-ICON("genlist")
-ICON("hoversel")
-ICON("list")
-ICON("map")
-ICON("notepad")
->>>>>>> remotes/origin/upstream
 ICON("photocam")
 ICON("progressbar")
 ICON("radio")
 ICON("scrolled_entry")
-<<<<<<< HEAD
 ICON("scroller")
-ICON("searchbar")
-=======
->>>>>>> remotes/origin/upstream
 ICON("slider")
 ICON("slideshow")
 ICON("spinner")
 ICON("thumb")
 ICON("toggle")
 ICON("toolbar")
-ICON("slideshow")
-
index 41838c2..0afa857 100644 (file)
@@ -47,12 +47,9 @@ icon_23.png \
 icon_right_arrow.png \
 bubble.png \
 bubble_sh.png \
-<<<<<<< HEAD
 copy&paste_icon_clipboard.png \
 copy&paste_icon_search.png \
 copy&paste_icon_share.png \
-=======
->>>>>>> remotes/origin/upstream
 mystrale.jpg \
 mystrale_2.jpg \
 twofish.jpg \
index 3bfeccc..ec51e7d 100644 (file)
@@ -770,10 +770,7 @@ collections {
                   relative: 0.7 340/400;
                   to: "bg";
                }
-<<<<<<< HEAD
-=======
                align: 0.5 0.0;
->>>>>>> remotes/origin/upstream
             }
          }
          part { name: "btn1_bottom_padding";
index 6ae281f..56ac20f 100644 (file)
@@ -29,10 +29,6 @@ widgets/notify.edc \
 widgets/slider.edc \
 widgets/button.edc \
 widgets/gengrid.edc \
-<<<<<<< HEAD
-widgets/pager.edc \
-=======
->>>>>>> remotes/origin/upstream
 widgets/slideshow.edc \
 widgets/calendar.edc \
 widgets/genlist.edc \
@@ -65,13 +61,10 @@ widgets/win.edc \
 widgets/entry.edc \
 widgets/map.edc \
 widgets/scroller.edc \
-<<<<<<< HEAD
-=======
 widgets/pointer.edc \
 widgets/datetime.edc \
 widgets/dayselector.edc \
 widgets/popup.edc \
->>>>>>> remotes/origin/upstream
 ews.edc \
 arrow_down.png \
 arrow_up.png \
@@ -323,9 +316,6 @@ mp_play.png \
 mp_prev.png \
 mp_rewind.png \
 mp_stop.png \
-<<<<<<< HEAD
-access_glow.png
-=======
 access_glow.png \
 pointer_glint_01.png \
 pointer_glint_02.png \
@@ -341,7 +331,6 @@ pointer_glint_11.png \
 pointer_glint_12.png \
 pointer_glow.png \
 pointer.png
->>>>>>> remotes/origin/upstream
 
 default.edj: Makefile $(EXTRA_DIST)
        $(EDJE_CC) $(EDJE_FLAGS) \
index af398d8..7615b92 100644 (file)
@@ -324,11 +324,8 @@ collections {
 #include "widgets/button.edc"
 #include "widgets/toggle.edc"
 #include "widgets/clock.edc"
-<<<<<<< HEAD
-=======
 #include "widgets/datetime.edc"
 #include "widgets/dayselector.edc"
->>>>>>> remotes/origin/upstream
 #include "widgets/menu.edc"
 #include "widgets/frame.edc"
 #include "widgets/tooltip.edc"
@@ -349,10 +346,6 @@ collections {
 #include "widgets/genlist.edc"
 #include "widgets/check.edc"
 #include "widgets/radio.edc"
-<<<<<<< HEAD
-#include "widgets/pager.edc"
-=======
->>>>>>> remotes/origin/upstream
 #include "widgets/progressbar.edc"
 #include "widgets/separator.edc"
 #include "widgets/spinner.edc"
@@ -374,12 +367,7 @@ collections {
 #include "widgets/video.edc"
 #include "widgets/naviframe.edc"
 #include "widgets/multibuttonentry.edc"
-<<<<<<< HEAD
-#include "ews.edc"
-
-=======
 #include "widgets/popup.edc"
 #include "ews.edc"
 #include "widgets/pointer.edc"
->>>>>>> remotes/origin/upstream
 }
diff --git a/data/themes/widgets/pager.edc b/data/themes/widgets/pager.edc
deleted file mode 100644 (file)
index 09f915b..0000000
+++ /dev/null
@@ -1,1072 +0,0 @@
-group { name: "elm/pager/base/default";
-   data.item: "onshow" "raise";
-   // other options
-   //      data.item: "onhide" "lower";
-   //      data.item: "onshow" "lower";
-   images {
-      image: "frame_1.png" COMP;
-      image: "frame_2.png" COMP;
-      image: "dia_grad.png" COMP;
-   }
-   parts {
-      part { name: "clip";
-         type: RECT;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1 {
-               to: "base";
-               offset: -9999 -9999;
-            }
-            rel2 {
-               to: "base";
-               offset: 9999 9999;
-            }
-            color: 255 255 255 255;
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 0;
-            visible: 0;
-         }
-      }
-      part { name: "base0";
-         mouse_events:  0;
-         clip_to: "clip";
-         description { state: "default" 0.0;
-            image.normal: "dia_grad.png";
-            rel1.to: "over";
-            rel2.to: "over";
-            fill {
-               smooth: 0;
-               size {
-                  relative: 0.0 1.0;
-                  offset: 64 0;
-               }
-            }
-         }
-      }
-      part { name: "base";
-         mouse_events:  0;
-         clip_to: "clip";
-         description { state: "default" 0.0;
-            image {
-               normal: "frame_2.png";
-               border: 5 5 32 26;
-               middle: 0;
-            }
-            fill.smooth : 0;
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            rel1.relative: -1.0 0.0;
-            rel2.relative: 0.0 1.0;
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 1.0;
-         }
-      }
-      part { name: "over";
-         mouse_events:  0;
-         clip_to: "clip";
-         description { state:    "default" 0.0;
-            rel1 {
-               to: "base";
-               offset: 4 4;
-            }
-            rel2 {
-               to: "base";
-               offset: -5 -5;
-            }
-            image {
-               normal: "frame_1.png";
-               border: 2 2 28 22;
-               middle: 0;
-            }
-            fill.smooth : 0;
-         }
-      }
-      part { name: "elm.swallow.content";
-         type: SWALLOW;
-         clip_to: "clip";
-         description { state: "default" 0.0;
-            rel1 {
-               to: "base";
-               offset: 8 8;
-            }
-            rel2 {
-               to: "base";
-               offset: -9 -9;
-            }
-         }
-      }
-   }
-   programs {
-      program { name: "push_start";
-         signal: "elm,action,push";
-         source: "elm";
-         action:  STATE_SET "hidden" 0.0;
-         target: "base";
-         target: "clip";
-         after: "show_start2";
-      }
-      program { name: "show_start";
-         signal: "elm,action,show";
-         source: "elm";
-         action:  STATE_SET "hidden" 0.0;
-         target: "base";
-         target: "clip";
-         after: "show_start2";
-      }
-      program { name: "show_start2";
-         action:  STATE_SET "visible" 0.0;
-         transition: DECELERATE 0.5;
-         target: "base";
-         target: "clip";
-         after: "show_end";
-      }
-      program { name: "show_end";
-         action: SIGNAL_EMIT "elm,action,show,finished" "";
-      }
-      program { name: "pop_start";
-         signal: "elm,action,pop";
-         source: "elm";
-         action:  STATE_SET "visible" 0.0;
-         target: "base";
-         target: "clip";
-         after: "hide_start2";
-      }
-      program { name: "hide_start";
-         signal: "elm,action,hide";
-         source: "elm";
-         action:  STATE_SET "visible" 0.0;
-         target: "base";
-         target: "clip";
-         after: "hide_start2";
-      }
-      program { name: "hide_start2";
-         action:  STATE_SET "hidden" 0.0;
-         transition: DECELERATE 0.5;
-         target: "base";
-         target: "clip";
-         after: "hide_end";
-      }
-      program { name: "hide_end";
-         action: SIGNAL_EMIT "elm,action,hide,finished" "";
-      }
-      program { name: "reset";
-         signal: "elm,action,reset";
-         source: "elm";
-         action:  STATE_SET "default" 0.0;
-         target: "base";
-         target: "clip";
-      }
-   }
-}
-
-group { name: "elm/pager/base/slide";
-   images {
-      image: "frame_1.png" COMP;
-      image: "frame_2.png" COMP;
-      image: "dia_grad.png" COMP;
-   }
-   parts {
-      part { name: "clip";
-         type: RECT;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1 {
-               to: "base";
-               offset: -9999 -9999;
-            }
-            rel2 {
-               to: "base";
-               offset: 9999 9999;
-            }
-            color: 255 255 255 255;
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 0;
-            visible: 0;
-         }
-         description { state: "hidden2" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 0;
-            visible: 0;
-         }
-      }
-      part { name: "base0";
-         mouse_events:  0;
-         clip_to: "clip";
-         description { state: "default" 0.0;
-            image.normal: "dia_grad.png";
-            rel1.to: "over";
-            rel2.to: "over";
-            fill {
-               smooth: 0;
-               size {
-                  relative: 0.0 1.0;
-                  offset: 64 0;
-               }
-            }
-         }
-      }
-      part { name: "base";
-         mouse_events:  0;
-         clip_to: "clip";
-         description { state: "default" 0.0;
-            image {
-               normal: "frame_2.png";
-               border: 5 5 32 26;
-               middle: 0;
-            }
-            fill.smooth : 0;
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            rel1.relative: -1.0 0.0;
-            rel2.relative: 0.0 1.0;
-         }
-         description { state: "hidden2" 0.0;
-            inherit: "default" 0.0;
-            rel1.relative: 1.0 0.0;
-            rel2.relative: 2.0 1.0;
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 1.0;
-         }
-      }
-      part { name: "over";
-         mouse_events:  0;
-         clip_to: "clip";
-         description { state:    "default" 0.0;
-            rel1 {
-               to: "base";
-               offset: 4 4;
-            }
-            rel2 {
-               to: "base";
-               offset: -5 -5;
-            }
-            image {
-               normal: "frame_1.png";
-               border: 2 2 28 22;
-               middle: 0;
-            }
-            fill.smooth : 0;
-         }
-      }
-      part { name: "elm.swallow.content";
-         type: SWALLOW;
-         clip_to: "clip";
-         description { state: "default" 0.0;
-            rel1 {
-               to: "base";
-               offset: 8 8;
-            }
-            rel2 {
-               to: "base";
-               offset: -9 -9;
-            }
-         }
-      }
-   }
-   programs {
-      program { name: "push_start";
-         signal: "elm,action,push";
-         source: "elm";
-         action:  STATE_SET "hidden2" 0.0;
-         target: "base";
-         target: "clip";
-         after: "show_start2";
-      }
-      program { name: "show_start";
-         signal: "elm,action,show";
-         source: "elm";
-         action:  STATE_SET "hidden" 0.0;
-         target: "base";
-         target: "clip";
-         after: "show_start2";
-      }
-      program { name: "show_start2";
-         action:  STATE_SET "visible" 0.0;
-         transition: DECELERATE 0.5;
-         target: "base";
-         target: "clip";
-         after: "show_end";
-      }
-      program { name: "show_end";
-         action: SIGNAL_EMIT "elm,action,show,finished" "";
-      }
-      program { name: "pop_start";
-         signal: "elm,action,pop";
-         source: "elm";
-         action:  STATE_SET "visible" 0.0;
-         target: "base";
-         target: "clip";
-         after: "pop_start2";
-      }
-      program { name: "pop_start2";
-         action:  STATE_SET "hidden2" 0.0;
-         transition: DECELERATE 0.5;
-         target: "base";
-         target: "clip";
-         after: "hide_end";
-      }
-      program { name: "hide_start";
-         signal: "elm,action,hide";
-         source: "elm";
-         action:  STATE_SET "visible" 0.0;
-         target: "base";
-         target: "clip";
-         after: "hide_start2";
-      }
-      program { name: "hide_start2";
-         action:  STATE_SET "hidden" 0.0;
-         transition: DECELERATE 0.5;
-         target: "base";
-         target: "clip";
-         after: "hide_end";
-      }
-      program { name: "hide_end";
-         action: SIGNAL_EMIT "elm,action,hide,finished" "";
-      }
-      program { name: "reset";
-         signal: "elm,action,reset";
-         source: "elm";
-         action:  STATE_SET "default" 0.0;
-         target: "base";
-         target: "clip";
-      }
-   }
-}
-group { name: "elm/pager/base/slide_invisible";
-   parts {
-      part { name: "clip";
-         type: RECT;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1 {
-               to: "base";
-               offset: -9999 -9999;
-            }
-            rel2 {
-               to: "base";
-               offset: 9999 9999;
-            }
-            color: 255 255 255 255;
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 0;
-            visible: 0;
-         }
-         description { state: "hidden2" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 0;
-            visible: 0;
-         }
-      }
-      part { name: "base";
-         type: RECT;
-         mouse_events:  0;
-         clip_to: "clip";
-         description { state: "default" 0.0;
-            color: 0 0 0 0;
-         }
-         description { state: "hidden" 0.0;
-            color: 0 0 0 0;
-            rel1.relative: -1.0 0.0;
-            rel2.relative: 0.0 1.0;
-         }
-         description { state: "hidden2" 0.0;
-            color: 0 0 0 0;
-            rel1.relative: 1.0 0.0;
-            rel2.relative: 2.0 1.0;
-         }
-         description { state: "visible" 0.0;
-            color: 0 0 0 0;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 1.0;
-         }
-      }
-      part { name: "elm.swallow.content";
-         type: SWALLOW;
-         clip_to: "clip";
-         description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
-         }
-      }
-   }
-   programs {
-      program { name: "push_start";
-         signal: "elm,action,push";
-         source: "elm";
-         action:  STATE_SET "hidden2" 0.0;
-         target: "base";
-         target: "clip";
-         after: "show_start2";
-      }
-      program { name: "show_start";
-         signal: "elm,action,show";
-         source: "elm";
-         action:  STATE_SET "hidden" 0.0;
-         target: "base";
-         target: "clip";
-         after: "show_start2";
-      }
-      program { name: "show_start2";
-         action:  STATE_SET "visible" 0.0;
-         transition: DECELERATE 0.5;
-         target: "base";
-         target: "clip";
-         after: "show_end";
-      }
-      program { name: "show_end";
-         action: SIGNAL_EMIT "elm,action,show,finished" "";
-      }
-      program { name: "pop_start";
-         signal: "elm,action,pop";
-         source: "elm";
-         action:  STATE_SET "visible" 0.0;
-         target: "base";
-         target: "clip";
-         after: "pop_start2";
-      }
-      program { name: "pop_start2";
-         action:  STATE_SET "hidden2" 0.0;
-         transition: DECELERATE 0.5;
-         target: "base";
-         target: "clip";
-         after: "hide_end";
-      }
-      program { name: "hide_start";
-         signal: "elm,action,hide";
-         source: "elm";
-         action:  STATE_SET "visible" 0.0;
-         target: "base";
-         target: "clip";
-         after: "hide_start2";
-      }
-      program { name: "hide_start2";
-         action:  STATE_SET "hidden" 0.0;
-         transition: DECELERATE 0.5;
-         target: "base";
-         target: "clip";
-         after: "hide_end";
-      }
-      program { name: "hide_end";
-         action: SIGNAL_EMIT "elm,action,hide,finished" "";
-      }
-      program { name: "reset";
-         signal: "elm,action,reset";
-         source: "elm";
-         action:  STATE_SET "default" 0.0;
-         target: "base";
-         target: "clip";
-      }
-   }
-}
-
-group { name: "elm/pager/base/fade";
-   data.item: "onshow" "raise";
-   // other options
-   //      data.item: "onhide" "lower";
-   //      data.item: "onshow" "lower";
-   images {
-      image: "frame_1.png" COMP;
-      image: "frame_2.png" COMP;
-      image: "dia_grad.png" COMP;
-   }
-   parts {
-      part { name: "clip_base";
-         type: RECT;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1 {
-               to: "base";
-               offset: -9999 -9999;
-            }
-            rel2 {
-               to: "base";
-               offset: 9999 9999;
-            }
-            color: 255 255 255 120;
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 0;
-            visible: 0;
-         }
-      }
-      part { name: "clip";
-         type: RECT;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1 {
-               to: "base";
-               offset: -9999 -9999;
-            }
-            rel2 {
-               to: "base";
-               offset: 9999 9999;
-            }
-            color: 255 255 255 255;
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 0;
-            visible: 0;
-         }
-      }
-      part { name: "base0";
-         mouse_events:  0;
-         clip_to: "clip_base";
-         description { state: "default" 0.0;
-            image.normal: "dia_grad.png";
-            rel1.to: "over";
-            rel2.to: "over";
-            fill {
-               smooth: 0;
-               size {
-                  relative: 0.0 1.0;
-                  offset: 64 0;
-               }
-            }
-         }
-      }
-      part { name: "base";
-         mouse_events:  0;
-         clip_to: "clip_base";
-         description { state: "default" 0.0;
-            image {
-               normal: "frame_2.png";
-               border: 5 5 32 26;
-               middle: 0;
-            }
-            fill.smooth : 0;
-         }
-      }
-      part { name: "over";
-         mouse_events:  0;
-         clip_to: "clip";
-         description { state:    "default" 0.0;
-            rel1 {
-               to: "base";
-               offset: 4 4;
-            }
-            rel2 {
-               to: "base";
-               offset: -5 -5;
-            }
-            image {
-               normal: "frame_1.png";
-               border: 2 2 28 22;
-               middle: 0;
-            }
-            fill.smooth : 0;
-         }
-      }
-      part { name: "elm.swallow.content";
-         type: SWALLOW;
-         clip_to: "clip";
-         description { state: "default" 0.0;
-            rel1 {
-               to: "base";
-               offset: 8 8;
-            }
-            rel2 {
-               to: "base";
-               offset: -9 -9;
-            }
-         }
-      }
-   }
-   programs {
-      program { name: "push_start";
-         signal: "elm,action,push";
-         source: "elm";
-         action:  STATE_SET "hidden" 0.0;
-         target: "clip";
-         target: "clip_base";
-         after: "show_start2";
-      }
-      program { name: "show_start";
-         signal: "elm,action,show";
-         source: "elm";
-         action:  STATE_SET "hidden" 0.0;
-         target: "clip";
-         target: "clip_base";
-         after: "show_start2";
-      }
-      program { name: "show_start2";
-         action:  STATE_SET "visible" 0.0;
-         transition: DECELERATE 0.5;
-         target: "clip";
-         target: "clip_base";
-         after: "show_end";
-      }
-      program { name: "show_end";
-         action: SIGNAL_EMIT "elm,action,show,finished" "";
-      }
-      program { name: "pop_start";
-         signal: "elm,action,pop";
-         source: "elm";
-         action:  STATE_SET "visible" 0.0;
-         target: "clip";
-         target: "clip_base";
-         after: "hide_start2";
-      }
-      program { name: "hide_start";
-         signal: "elm,action,hide";
-         source: "elm";
-         action:  STATE_SET "visible" 0.0;
-         target: "clip";
-         target: "clip_base";
-         after: "hide_start2";
-      }
-      program { name: "hide_start2";
-         action:  STATE_SET "hidden" 0.0;
-         transition: DECELERATE 0.5;
-         target: "clip";
-         target: "clip_base";
-         after: "hide_end";
-      }
-      program { name: "hide_end";
-         action: SIGNAL_EMIT "elm,action,hide,finished" "";
-      }
-      program { name: "reset";
-         signal: "elm,action,reset";
-         source: "elm";
-         action:  STATE_SET "default" 0.0;
-         target: "clip_base";
-         target: "clip";
-      }
-   }
-}
-group { name: "elm/pager/base/fade_translucide";
-   data.item: "onshow" "raise";
-   // other options
-   //      data.item: "onhide" "lower";
-   //      data.item: "onshow" "lower";
-   images {
-      image: "frame_1.png" COMP;
-      image: "frame_2.png" COMP;
-      image: "dia_grad.png" COMP;
-   }
-   parts {
-      part { name: "clip_base";
-         type: RECT;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1 {
-               to: "base";
-               offset: -9999 -9999;
-            }
-            rel2 {
-               to: "base";
-               offset: 9999 9999;
-            }
-            color: 255 255 255 120;
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 0;
-            visible: 0;
-         }
-      }
-      part { name: "clip";
-         type: RECT;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1 {
-               to: "base";
-               offset: -9999 -9999;
-            }
-            rel2 {
-               to: "base";
-               offset: 9999 9999;
-            }
-            color: 255 255 255 255;
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 0;
-            visible: 0;
-         }
-      }
-      part { name: "base0";
-         mouse_events:  0;
-         clip_to: "clip_base";
-         description { state: "default" 0.0;
-            image.normal: "dia_grad.png";
-            rel1.to: "over";
-            rel2.to: "over";
-            fill {
-               smooth: 0;
-               size {
-                  relative: 0.0 1.0;
-                  offset: 64 0;
-               }
-            }
-         }
-      }
-      part { name: "base";
-         mouse_events:  0;
-         clip_to: "clip_base";
-         description { state: "default" 0.0;
-            image {
-               normal: "frame_2.png";
-               border: 5 5 32 26;
-               middle: 0;
-            }
-            fill.smooth : 0;
-         }
-      }
-      part { name: "over";
-         mouse_events:  0;
-         clip_to: "clip";
-         description { state:    "default" 0.0;
-            rel1 {
-               to: "base";
-               offset: 4 4;
-            }
-            rel2 {
-               to: "base";
-               offset: -5 -5;
-            }
-            image {
-               normal: "frame_1.png";
-               border: 2 2 28 22;
-               middle: 0;
-            }
-            fill.smooth : 0;
-         }
-      }
-      part { name: "elm.swallow.content";
-         type: SWALLOW;
-         clip_to: "clip";
-         description { state: "default" 0.0;
-            rel1 {
-               to: "base";
-               offset: 8 8;
-            }
-            rel2 {
-               to: "base";
-               offset: -9 -9;
-            }
-         }
-      }
-   }
-   programs {
-      program { name: "push_start";
-         signal: "elm,action,push";
-         source: "elm";
-         action:  STATE_SET "hidden" 0.0;
-         target: "clip";
-         target: "clip_base";
-         after: "show_start2";
-      }
-      program { name: "show_start";
-         signal: "elm,action,show";
-         source: "elm";
-         action:  STATE_SET "hidden" 0.0;
-         target: "clip";
-         target: "clip_base";
-         after: "show_start2";
-      }
-      program { name: "show_start2";
-         action:  STATE_SET "visible" 0.0;
-         transition: DECELERATE 0.5;
-         target: "clip";
-         target: "clip_base";
-         after: "show_end";
-      }
-      program { name: "show_end";
-         action: SIGNAL_EMIT "elm,action,show,finished" "";
-      }
-      program { name: "pop_start";
-         signal: "elm,action,pop";
-         source: "elm";
-         action:  STATE_SET "visible" 0.0;
-         target: "clip";
-         target: "clip_base";
-         after: "hide_start2";
-      }
-      program { name: "hide_start";
-         signal: "elm,action,hide";
-         source: "elm";
-         action:  STATE_SET "visible" 0.0;
-         target: "clip";
-         target: "clip_base";
-         after: "hide_start2";
-      }
-      program { name: "hide_start2";
-         action:  STATE_SET "hidden" 0.0;
-         transition: DECELERATE 0.5;
-         target: "clip";
-         target: "clip_base";
-         after: "hide_end";
-      }
-      program { name: "hide_end";
-         action: SIGNAL_EMIT "elm,action,hide,finished" "";
-      }
-      program { name: "reset";
-         signal: "elm,action,reset";
-         source: "elm";
-         action:  STATE_SET "default" 0.0;
-         target: "clip_base";
-         target: "clip";
-      }
-   }
-}
-group { name: "elm/pager/base/fade_invisible";
-   data.item: "onshow" "raise";
-   // other options
-   //      data.item: "onhide" "lower";
-   //      data.item: "onshow" "lower";
-   parts {
-      part { name: "clip";
-         type: RECT;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1 {
-               offset: -9999 -9999;
-            }
-            rel2 {
-               offset: 9999 9999;
-            }
-            color: 255 255 255 255;
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 0;
-            visible: 0;
-         }
-      }
-      part { name: "elm.swallow.content";
-         type: SWALLOW;
-         clip_to: "clip";
-         description { state: "default" 0.0;
-            rel1 {
-               offset: 8 8;
-            }
-            rel2 {
-               offset: -9 -9;
-            }
-         }
-      }
-   }
-   programs {
-      program { name: "push_start";
-         signal: "elm,action,push";
-         source: "elm";
-         action:  STATE_SET "hidden" 0.0;
-         target: "clip";
-         after: "show_start2";
-      }
-      program { name: "show_start";
-         signal: "elm,action,show";
-         source: "elm";
-         action:  STATE_SET "hidden" 0.0;
-         target: "clip";
-         after: "show_start2";
-      }
-      program { name: "show_start2";
-         action:  STATE_SET "visible" 0.0;
-         transition: DECELERATE 0.5;
-         target: "clip";
-         after: "show_end";
-      }
-      program { name: "show_end";
-         action: SIGNAL_EMIT "elm,action,show,finished" "";
-      }
-      program { name: "pop_start";
-         signal: "elm,action,pop";
-         source: "elm";
-         action:  STATE_SET "visible" 0.0;
-         target: "clip";
-         after: "hide_start2";
-      }
-      program { name: "hide_start";
-         signal: "elm,action,hide";
-         source: "elm";
-         action:  STATE_SET "visible" 0.0;
-         target: "clip";
-         after: "hide_start2";
-      }
-      program { name: "hide_start2";
-         action:  STATE_SET "hidden" 0.0;
-         transition: DECELERATE 0.5;
-         target: "clip";
-         after: "hide_end";
-      }
-      program { name: "hide_end";
-         action: SIGNAL_EMIT "elm,action,hide,finished" "";
-      }
-      program { name: "reset";
-         signal: "elm,action,reset";
-         source: "elm";
-         action:  STATE_SET "default" 0.0;
-         target: "clip";
-      }
-   }
-}
-
-group { name: "elm/pager/base/flip";
-   data.item: "onshow" "raise";
-   images {
-      image: "frame_1.png" COMP;
-      image: "frame_2.png" COMP;
-      image: "dia_grad.png" COMP;
-   }
-   parts {
-      part { name: "elm.swallow.content";
-         type: SWALLOW;
-         description { state: "default" 0.0;
-            map {
-               on: 1;
-               smooth: 1;
-               backface_cull: 1;
-               perspective_on: 1;
-            }
-            perspective {
-               zplane: 0;
-               focal: 1000;
-            }
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-            map.rotation.y: 90.0;
-         }
-         description { state: "before_hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-            map.rotation.y: -90.0;
-         }
-      }
-   }
-   programs {
-      program { name: "push_start";
-         signal: "elm,action,push";
-         source: "elm";
-         after: "push1";
-      }
-      program { name: "push1";
-         action:  STATE_SET "hidden" 0.0;
-         target: "elm.swallow.content";
-         after: "push2";
-      }
-      program { name: "push2";
-         action:  STATE_SET "default" 0.0;
-         in: 0.5 0.0;
-         transition: LINEAR 0.5;
-         target: "elm.swallow.content";
-         after: "push3";
-      }
-      program { name: "push3";
-         action: SIGNAL_EMIT "elm,action,show,finished" "";
-      }
-
-      program { name: "show_start";
-         signal: "elm,action,show";
-         source: "elm";
-         after: "show1";
-      }
-      program { name: "show1";
-         action:  STATE_SET "before_hidden" 0.0;
-         target: "elm.swallow.content";
-         after: "show2";
-      }
-      program { name: "show2";
-         action:  STATE_SET "default" 0.0;
-         in: 0.5 0.0;
-         transition: LINEAR 0.5;
-         target: "elm.swallow.content";
-         after: "show3";
-      }
-      program { name: "show3";
-         action: SIGNAL_EMIT "elm,action,show,finished" "";
-      }
-
-      program { name: "pop_start";
-         signal: "elm,action,pop";
-         source: "elm";
-         after: "pop1";
-      }
-      program { name: "pop1";
-         action:  STATE_SET "default" 0.0;
-         target: "elm.swallow.content";
-         after: "pop2";
-      }
-      program { name: "pop2";
-         action:  STATE_SET "hidden" 0.0;
-         transition: LINEAR 0.5;
-         target: "elm.swallow.content";
-         after: "pop3";
-      }
-      program { name: "pop3";
-         action: SIGNAL_EMIT "elm,action,hide,finished" "";
-      }
-
-      program { name: "hide_start";
-         signal: "elm,action,hide";
-         source: "elm";
-         after: "hide1";
-      }
-      program { name: "hide1";
-         action:  STATE_SET "default" 0.0;
-         target: "elm.swallow.content";
-         after: "hide2";
-      }
-      program { name: "hide2";
-         action:  STATE_SET "before_hidden" 0.0;
-         transition: LINEAR 0.5;
-         target: "elm.swallow.content";
-         after: "hide3";
-      }
-      program { name: "hide3";
-         action: SIGNAL_EMIT "elm,action,hide,finished" "";
-      }
-
-      program { name: "reset";
-         signal: "elm,action,reset";
-         source: "elm";
-         action:  STATE_SET "default" 0.0;
-         target: "elm.swallow.content";
-      }
-   }
-}
-
-
-
index 5af26e9..8fab361 100644 (file)
@@ -33,13 +33,10 @@ WGT_PREVIEW = \
        frame:preview-00.png:widget_preview_frame:100:50 \
        label:preview-00.png:widget_preview_label:70:30 \
        clock:preview-00.png:widget_preview_clock:200:100 \
-<<<<<<< HEAD
-=======
        datetime:preview-00.png:widget_preview_datetime1:360:60 \
        datetime:preview-01.png:widget_preview_datetime2:200:60 \
        datetime:preview-02.png:widget_preview_datetime3:200:60 \
        dayselector:preview-00.png:widget_preview_dayselector:350:50 \
->>>>>>> remotes/origin/upstream
        slider:preview-00.png:widget_preview_slider:200:100 \
        panes:preview-00.png:widget_preview_panes:200:100 \
        toolbar:preview-00.png:widget_preview_toolbar:300:100 \
@@ -77,10 +74,7 @@ WGT_PREVIEW = \
        progressbar:preview-00.png:widget_preview_progressbar:150:50 \
        box:preview-00.png:widget_preview_box:200:160 \
        notify:preview-00.png:widget_preview_notify:60:30 \
-<<<<<<< HEAD
-=======
        popup:preview-00.png:widget_preview_popup:480:400 \
->>>>>>> remotes/origin/upstream
        slideshow:preview-00.png:widget_preview_slideshow:50:50 \
        photocam:preview-00.png:widget_preview_photocam:243:162 \
        inwin:preview-00.png:widget_preview_inwin1:200:160 \
index c1ded30..39094fa 100644 (file)
  *
  * @ref clock_example
  *
-<<<<<<< HEAD
-=======
  * @ref datetime_example
  *
  * @ref dayselector_example
  *
->>>>>>> remotes/origin/upstream
  * @ref mapbuf_example
 
  * @ref map_example_01
  */
 
 /**
-<<<<<<< HEAD
-=======
  * @page datetime_example Datetime widget example
  *
  * This code places three Elementary Datetime widgets on a window, each of
  */
 
 /**
->>>>>>> remotes/origin/upstream
  * @page mapbuf_example Mapbuf Widget Example
  *
  * This code places a Elementary mapbuf widget on a window,
  */
 
 /**
-<<<<<<< HEAD
- * @page map_example_02 Map Example - Markers Usage
- *
- * This code places a Elementary map widget on a window,
- * to exemplify part of the widget's API, related to markers.
- *
- * We'll start this example the same way
-=======
  * @page map_example_02 Map Example - Overlay Usage
  *
  * This code places a Elementary map widget on a window,
  * to exemplify part of the widget's API, related to overlays.
  *
  * We'll start this example in the same way
->>>>>>> remotes/origin/upstream
  * @ref map_example_01 "Map Example 1". Adding a map with buttons to control
  * zoom, so if you didn't read it yet, just do it now.
  * @dontinclude map_example_02.c
  * @skipline elm_map_add
  * @until zoom_fill
  *
-<<<<<<< HEAD
- * Markers can be placed over the map to represent anything we want. Let's
- * say we want to represent some countries and cities with markers. To add
- * a mark we need a marker class and also a group class.
- *
- * A marker class can be created as the following code does:
- * @skipline marker_class_new
- * @until style_set
- *
- * These lines create a new class, set a function to return the object
- * to be displayed inside the bubble that opens when a user clicks over
- * the mark, set the function to retrieve an icon to be placed inside
- * the marker, and defines the style of this marker. It can be @c empty
- * that will just show the icon, @c radio, that will place a blue circle,
- * and @c radio2 that will place a green circle.
- *
- * The group classes can be created in a very similar way, but you won't
- * set callback functions to get stuff to be placed inside the bubble,
- * since clicking over a group marker will just get the content
- * of all the markers composing the group and place on this bubble.
- * The limit of markers to get can be set with function
- * elm_map_max_marker_per_group_set() but we won't need on this example.
- * But we can set the zoom required to display the marks that belongs
- * to this group class, so if the zoom is less than this value, nothing
- * will be show. The group marker style will be used when markers are
- * near each other, and the count of markers grouped will be placed
- * inside the group marker.
- * @skipline group_class_new
- * @until displayed_set
- *
- * For marker and group classes to represent a country, the same is done:
- * @skipline marker_class_new
- * @until displayed_set
- *
- * Next we'll create some markers representing cities and coutries.
- * We'll append them in a list, to close up them later. To create a marker
- * we need to pass the coordinates, marker class, group class and optionally,
- * data:
- * @skipline marker_add
- * @until data_chile
- * @until append
-=======
  * Overlays can be placed over the map to represent anything we want. Let's
  * say we want to represent some countries and cities with overlays. 
  * 
  * Finally, on our @c main function, we ask the map to show all the overlays
  * with the biggest zoom possible, passing the list of overlays added.
  * @skipline elm_map_overlays_show
->>>>>>> remotes/origin/upstream
  *
  * We have created a specific structure for this example to store the name
  * of the place and a path to a image file to represent it.
  * @dontinclude map_example_02.c
  * @skipline typedef
-<<<<<<< HEAD
- * @until Marker_Data;
-=======
  * @until Overlay_Data;
->>>>>>> remotes/origin/upstream
  *
  * We'll create instances for each place:
  * @skipline argentina
  * @until sky_03
  *
-<<<<<<< HEAD
- * Finally, on our @c main function, we ask the map to show all the markers
- * with the biggest zoom possible, passing the list of markers added:
- * @skipline list_show
- *
- * Actually the zoom is not what we want, so after the download of the map
- * is concluded, let's set another zoom level. For this we add a callback
- * for @c "downloaded" signal:
- * @skipline callback_add
- *
- * The callback function will simply set the zoom level we want and remove
- * the callback, otherwise it would be called all the time, after the map
- * is downloaded:
- * @dontinclude map_example_02.c
- * @skipline _map_downloaded
- * @until }
- *
- * We added two kinds of callback functions when we added the markers.
- * One will return the content of the bubbles, and other the icon to be
- * placed inside the marker.
- *
- * To return an icon, all we need to do is add a elm_icon and return it:
- * @dontinclude map_example_02.c
- * @skip static Evas_Object
- * @skip }
- * @skipline static Evas_Object
- * @until }
- *
- * For the content, let's return something more elaboreate. We will return
- * a box with an image representing the place, and the name of this place:
- * @skipline static Evas_Object
-=======
   * To return an icon, all we need to do is to add a elm_icon and return it:
  * @dontinclude map_example_02.c
  * @skipline _icon_get(
  * For the content, let's return something more elaborate. We will return
  * a box with an image representing the place, and the name of this place:
  * @skipline _box_get(
->>>>>>> remotes/origin/upstream
  * @until }
  *
  * See @ref map_example_02.c "map_example_02.c" for full source,
  * start point, and would like that he enters the address of his
  * destination in a entry, and we'll trace a route on the map.
  *
-<<<<<<< HEAD
- * We'll start this example the same way
-=======
  * We'll start this example in the same way
->>>>>>> remotes/origin/upstream
  * @ref map_example_01 "Map Example 1". Adding a map with buttons to control
  * zoom, so if you didn't read it yet, just do it now. Actually there is
  * a change, that we're aligning buttons to the top, since we wan't a
  * diskselector will display first item after last, and last previous to
  * the first one. So, as you can see, @b Sa will appears on left side
  * of selected @b Sunday. This property is set with
-<<<<<<< HEAD
- * elm_diskselector_round_set().
- *
- * Also, we decide to display only 2 character for side labels, instead of 3.
- * For this we call elm_diskselector_side_label_length_set(). As result,
-=======
  * elm_diskselector_round_enabled_set().
  *
  * Also, we decide to display only 2 character for side labels, instead of 3.
  * For this we call elm_diskselector_side_text_max_length_set(). As result,
->>>>>>> remotes/origin/upstream
  * we'll see @b Mo displayed instead of @b Mon, when @b Monday is on a
  * side position.
  *
   * elm_image_no_scale_set() is used just to set this value to true (we
   * don't want to scale our image anyway, just resize it).
   *
-<<<<<<< HEAD
-  * elm_image_scale_set() is used to allow the image to be resized to a size
-=======
   * elm_image_resizable_set() is used to allow the image to be resized to a size
->>>>>>> remotes/origin/upstream
   * smaller than the original one, but not to a size bigger than it.
   *
   * elm_elm_image_smooth_set() will disable the smooth scaling, so the scale
   * elm_icon_no_scale_set() is used just to set this value to true (we
   * don't want to scale our icon anyway, just resize it).
   *
-<<<<<<< HEAD
-  * elm_icon_scale_set() is used to allow the icon to be resized to a size
-=======
   * elm_icon_resizable_set() is used to allow the icon to be resized to a size
->>>>>>> remotes/origin/upstream
   * smaller than the original one, but not to a size bigger than it.
   *
   * elm_elm_icon_smooth_set() will disable the smooth scaling, so the scale
  */
 
 /**
-<<<<<<< HEAD
- * @page tutorial_pager
- * @dontinclude pager_example_01.c
- *
- * In this example we'll have a pager with 3 rectangles on it, one blue, one
- * green and one blue, we'll also have 1 button for each rectangle. Pressing a
- * button will bring the associated rectangle to the front of the pager(promote
- * it).
- *
- * We start our example with some run of the mill code that you've seen in other
- * examples:
- * @until show
- *
- * And then we get right to creating our pager, setting a style and some basic
- * properties to it:
- * @until show
- *
- * Well a pager without any content is not of much use, so let's create the
- * first of our rectangles, add it to the pager and create the button for it:
- * @until smart_callback
- * @note The only line of above code that directly relates to our pager is the
- * call to elm_pager_content_push().
- *
- * And now we will do the same thing again twice for our next two rectangles:
- * @until smart_callback
- * @until smart_callback
- *
- * Now that we haver our widgets create we can get to running the main loop:
- * @until ELM_MAIN
- *
- * We also have the callback that is called when any of the buttons is pressed,
- * this callback is receiving the rectangle in it's @p data argument, so we
- * check if it's already on top and if not move it there:
- * @until }
- *
- * Our example will look like this:
- *
- * @image html screenshots/pager_example_01.png
- * @image latex screenshots/pager_example_01.eps width=\textwidth
- * @note Like all examples that involve animations the screenshot doesn't do it
- * justice, seeing it in action is a must.
- *
- * @example pager_example_01.c
- */
-
-/**
-=======
->>>>>>> remotes/origin/upstream
  * @page tutorial_separator Separator example
  * @dontinclude separator_example_01.c
  *
  * and the entry itself doesn't, yet, support all the needed capabilities to
  * make this simpler. We begin by getting the format we are using in our
  * function from the button pressed.
-<<<<<<< HEAD
- * @skip aid->pager = pager;
-=======
  * @skip aid->naviframe = naviframe;
->>>>>>> remotes/origin/upstream
  * @until sizeof(fmt_close)
  *
  * Next we need to find out if we need to insert an opening or a closing tag.
  * elm_genlist_bounce_set().
  *
  * We also want our list to compress items if they are wider than the list
-<<<<<<< HEAD
- * width (thus we call elm_genlist_compress_mode_set().
-=======
  * width (thus we call elm_genlist_mode_set(obj, ELM_LIST_COMPRESS).
->>>>>>> remotes/origin/upstream
  *
  * The items have different width, so they are not homogeneous:
  * elm_genlist_homogeneous_set() is set to false.
  * However, if the @c item1 didn't have any child previously, we have to change
  * it to a parent item now. It would be easy to just change its item class to
  * the parent type, but there's no way to change the item flags and make it be
-<<<<<<< HEAD
- * of the type #ELM_GENLIST_ITEM_SUBITEMS. Thus, we have to delete it and create
-=======
  * of the type #ELM_GENLIST_ITEM_TREE. Thus, we have to delete it and create
->>>>>>> remotes/origin/upstream
  * a new item, and add this new item to the same position that the deleted one
  * was. That's the reason of the checks inside the bigger @c if.
  *
  */
 
 /**
-<<<<<<< HEAD
-=======
  * @page popup_example_01_c popup_example_01.c
  * @include popup_example_01.c
  *
  */
 
 /**
->>>>>>> remotes/origin/upstream
  * @page tutorial_frame Frame example
  * @dontinclude frame_example_01.c
  *
  * accordingly and the URL bar needs to show the right address.
  *
  * @skip static void
-<<<<<<< HEAD
- * @until pager_content_promote
-=======
  * @until naviframe_item_simple_promote
->>>>>>> remotes/origin/upstream
  * @until }
  *
  * Other updates happen based on events from the web object, like title change
  * @example clock_example.c
  */
 
-<<<<<<< HEAD
-=======
  /**
  * @page datetime_example_c Datetime example
  * @include datetime_example.c
  * @example dayselector_example.c
  */
 
->>>>>>> remotes/origin/upstream
 /**
  * @page flipselector_example_c Flipselector example
  * @include flipselector_example.c
index 2b51346..f535170 100644 (file)
  * @li @ref Start
  * @li @ref Scrolling
  * @li @ref Scrollhints
-<<<<<<< HEAD
- * @li @ref UI-Mirroring
-=======
  * @li @ref Mirroring
->>>>>>> remotes/origin/upstream
  * @li @ref Scaling
  * @li @ref Styles
  * @li @ref Theme
@@ -87,8 +83,6 @@
  *
  * @image html img/widget/ctxpopup/preview-00.png
  * @image latex img/widget/ctxpopup/preview-00.eps
-<<<<<<< HEAD
-=======
  * @li @ref Datetime
  *
  * @image html img/widget/datetime/preview-00.png
@@ -97,7 +91,6 @@
  *
  * @image html img/widget/dayselector/preview-00.png
  * @image latex img/widget/dayselector/preview-00.eps
->>>>>>> remotes/origin/upstream
  * @li @ref Diskselector
  *
  * @image html img/widget/diskselector/preview-00.png
  *
  * @image html img/widget/frame/preview-00.png
  * @image latex img/widget/frame/preview-00.eps
-<<<<<<< HEAD
- * @li @ref Gengrid
- *
- * @image html img/widget/gengrid/preview-00.png
- * @image latex img/widget/gengrid/preview-00.eps
- * 
- * @li @ref Genlist
- * @image html img/widget/genlist/preview-00.png
- * @image latex img/widget/genlist/preview-00.eps
- * @image html img/genlist.png
- * @image latex img/genlist.eps
-=======
->>>>>>> remotes/origin/upstream
  *
  * @li @ref GLView
  * @li @ref Hover
  *
  * @image html img/widget/notify/preview-00.png
  * @image latex img/widget/notify/preview-00.eps
-<<<<<<< HEAD
- * @li @ref Pager
- *
- * @image html img/widget/pager/preview-00.png
- * @image latex img/widget/pager/preview-00.eps
-=======
->>>>>>> remotes/origin/upstream
  * @li @ref Panel
  *
  * @image html img/widget/panel/preview-00.png
  *
  * @image html img/widget/photocam/preview-00.png
  * @image latex img/widget/photocam/preview-00.eps
-<<<<<<< HEAD
-=======
  * @li @ref Popup
  *
  * @image html img/widget/popup/preview-00.png
  * @image latex img/widget/popup/preview-00.eps
->>>>>>> remotes/origin/upstream
  * @li @ref Progressbar
  *
  * @image html img/widget/progressbar/preview-00.png
  * it provides a number of containers. It's important to note that as containers
  * widgets don't have their own visual identity, so here we show one use for
  * them and a diagram showing their component parts:
-<<<<<<< HEAD
-=======
  * @li @ref Gengrid
  *
  * @image html img/widget/gengrid/preview-00.png
  * @image latex img/widget/genlist/preview-00.eps
  * @image html img/genlist.png
  * @image latex img/genlist.eps
->>>>>>> remotes/origin/upstream
  * @li @ref Box
  *
  * @image html img/widget/box/preview-00.png
index d196584..f1583bd 100644 (file)
@@ -32,12 +32,9 @@ widget_preview_spinner \
 widget_preview_bubble1 \
 widget_preview_bubble2 \
 widget_preview_bubble3 \
-<<<<<<< HEAD
-=======
 widget_preview_datetime1 \
 widget_preview_datetime2 \
 widget_preview_datetime3 \
->>>>>>> remotes/origin/upstream
 widget_preview_fileselector_button1 \
 widget_preview_fileselector_button2 \
 widget_preview_fileselector_button3 \
@@ -48,10 +45,7 @@ widget_preview_segment_control \
 widget_preview_conformant \
 widget_preview_index \
 widget_preview_clock \
-<<<<<<< HEAD
-=======
 widget_preview_dayselector \
->>>>>>> remotes/origin/upstream
 widget_preview_label \
 widget_preview_frame \
 widget_preview_slider \
@@ -75,14 +69,7 @@ widget_preview_fileselector_entry \
 widget_preview_flipselector \
 widget_preview_hoversel \
 widget_preview_hover \
-<<<<<<< HEAD
-widget_preview_anchorview \
-widget_preview_anchorblock \
 widget_preview_flip \
-widget_preview_pager \
-=======
-widget_preview_flip \
->>>>>>> remotes/origin/upstream
 widget_preview_separator \
 widget_preview_radio \
 widget_preview_toggle \
@@ -96,10 +83,7 @@ widget_preview_genlist5 \
 widget_preview_progressbar \
 widget_preview_box \
 widget_preview_notify \
-<<<<<<< HEAD
-=======
 widget_preview_popup \
->>>>>>> remotes/origin/upstream
 widget_preview_slideshow \
 widget_preview_photocam \
 widget_preview_inwin1 \
@@ -118,11 +102,6 @@ endif
 
 EXTRA_DIST = \
        widget_preview_actionslider.c \
-<<<<<<< HEAD
-       widget_preview_anchorblock.c \
-       widget_preview_anchorview.c \
-=======
->>>>>>> remotes/origin/upstream
        widget_preview_bg.c \
        widget_preview_bubble1.c \
        widget_preview_bubble2.c \
@@ -144,13 +123,10 @@ EXTRA_DIST = \
        widget_preview_mapbuf.c \
        widget_preview_map.c \
        widget_preview_ctxpopup.c \
-<<<<<<< HEAD
-=======
        widget_preview_datetime1.c \
        widget_preview_datetime2.c \
        widget_preview_datetime3.c \
        widget_preview_dayselector.c \
->>>>>>> remotes/origin/upstream
        widget_preview_diskselector.c \
        widget_preview_entry1.c \
        widget_preview_entry2.c \
@@ -173,11 +149,7 @@ EXTRA_DIST = \
        widget_preview_layout.c \
        widget_preview_list.c \
        widget_preview_segment_control.c \
-<<<<<<< HEAD
-       widget_preview_pager.c \
-=======
        widget_preview_popup.c \
->>>>>>> remotes/origin/upstream
        widget_preview_separator.c \
        widget_preview_radio.c \
        widget_preview_toggle.c \
index 55c25c1..fcc655b 100644 (file)
@@ -94,10 +94,7 @@ test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
 %{_datadir}/elementary/config/default/*
 %{_datadir}/elementary/config/illume/*
 %{_datadir}/elementary/config/standard/*
-<<<<<<< HEAD
 %{_datadir}/elementary/config/slp/*
-=======
->>>>>>> remotes/origin/upstream
 %{_datadir}/elementary/edje_externals/*
 %{_datadir}/elementary/images/*
 %{_datadir}/elementary/objects/*
index 6258cc5..2dcd6e4 100644 (file)
@@ -2,11 +2,6 @@
 ./src/bin/quicklaunch.c
 ./src/bin/run.c
 ./src/bin/test_actionslider.c
-<<<<<<< HEAD
-./src/bin/test_anchorblock.c
-./src/bin/test_anchorview.c
-=======
->>>>>>> remotes/origin/upstream
 ./src/bin/test_anim.c
 ./src/bin/test_bg.c
 ./src/bin/test_box.c
 ./src/bin/test_menu.c
 ./src/bin/test_multi.c
 ./src/bin/test_notify.c
-<<<<<<< HEAD
-./src/bin/test_pager.c
-=======
->>>>>>> remotes/origin/upstream
 ./src/bin/test_panel.c
 ./src/bin/test_panes.c
 ./src/bin/test_photo.c
 ./src/bin/test_transit.c
 ./src/bin/test_weather.c
 ./src/bin/test_win_state.c
-<<<<<<< HEAD
-./src/edje_externals/elm_anchorblock.c
-./src/edje_externals/elm_anchorview.c
-=======
->>>>>>> remotes/origin/upstream
 ./src/edje_externals/elm_bubble.c
 ./src/edje_externals/elm_button.c
 ./src/edje_externals/elm.c
 ./src/edje_externals/elm_thumb.c
 ./src/edje_externals/elm_toggle.c
 ./src/edje_externals/elm_toolbar.c
-<<<<<<< HEAD
-./src/lib/elc_anchorblock.c
-./src/lib/elc_anchorview.c
-=======
->>>>>>> remotes/origin/upstream
 ./src/lib/elc_ctxpopup.c
 ./src/lib/elc_fileselector_button.c
 ./src/lib/elc_fileselector.c
 ./src/lib/elm_calendar.c
 ./src/lib/elm_check.c
 ./src/lib/elm_clock.c
-<<<<<<< HEAD
-./src/lib/elm_cnp_helper.c
-./src/lib/elm_colorselector.c
-./src/lib/elm_config.c
-./src/lib/elm_conform.c
-./src/lib/elm_datefield.c
-=======
 ./src/lib/elm_cnp.c
 ./src/lib/elm_colorselector.c
 ./src/lib/elm_config.c
 ./src/lib/elm_conform.c
->>>>>>> remotes/origin/upstream
 ./src/lib/elm_diskselector.c
 ./src/lib/elm_entry.c
 ./src/lib/elm_flip.c
 ./src/lib/elm_menu.c
 ./src/lib/elm_module.c
 ./src/lib/elm_notify.c
-<<<<<<< HEAD
-./src/lib/elm_pager.c
-=======
->>>>>>> remotes/origin/upstream
 ./src/lib/elm_panel.c
 ./src/lib/elm_panes.c
 ./src/lib/elm_photo.c
 ./src/lib/elm_progressbar.c
 ./src/lib/elm_radio.c
 ./src/lib/elm_scroller.c
-<<<<<<< HEAD
-./src/lib/elm_searchbar.c
-=======
->>>>>>> remotes/origin/upstream
 ./src/lib/elm_separator.c
 ./src/lib/elm_slider.c
 ./src/lib/elm_slideshow.c
index 0020737..b586de7 100644 (file)
--- a/po/ar.po
+++ b/po/ar.po
@@ -2,20 +2,12 @@
 # This file is distributed under the same license as the Elementary package.
 # FIRST AUTHOR <tom.hacohen@partner.samsung.com>, 2010.
 #
-<<<<<<< HEAD
-#: src/lib/elm_config.c:1417
-=======
 #: src/lib/elm_config.c:1943
->>>>>>> remotes/origin/upstream
 msgid ""
 msgstr ""
 "Project-Id-Version: elementary\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2012-02-05 10:59+0900\n"
-=======
 "POT-Creation-Date: 2012-03-08 01:42+0900\n"
->>>>>>> remotes/origin/upstream
 "PO-Revision-Date: 2010-12-26 10:05+0200\n"
 "Last-Translator: Tom Hacohen <tom.hacohen@partner.samsung.com>\n"
 "Language-Team: General\n"
@@ -34,20 +26,11 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elc_fileselector.c:1001 src/lib/elm_entry.c:1468
-#: src/lib/elm_searchbar.c:211
-msgid "Cancel"
-msgstr ""
-
-#: src/lib/elc_fileselector.c:1011
-=======
 #: src/lib/elc_fileselector.c:1009 src/lib/elm_entry.c:1357
 msgid "Cancel"
 msgstr ""
 
 #: src/lib/elc_fileselector.c:1019
->>>>>>> remotes/origin/upstream
 msgid "OK"
 msgstr ""
 
@@ -55,13 +38,8 @@ msgstr ""
 msgid "Clicked"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_button.c:408 src/lib/elm_check.c:392 src/lib/elm_radio.c:295
-#: src/lib/elm_toolbar.c:759
-=======
 #: src/lib/elm_button.c:408 src/lib/elm_check.c:394 src/lib/elm_radio.c:295
 #: src/lib/elm_toolbar.c:886
->>>>>>> remotes/origin/upstream
 msgid "State: Disabled"
 msgstr ""
 
@@ -73,63 +51,16 @@ msgstr ""
 msgid "%B %Y"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_check.c:309 src/lib/elm_check.c:312 src/lib/elm_check.c:403
-=======
 #: src/lib/elm_check.c:311 src/lib/elm_check.c:314 src/lib/elm_check.c:405
->>>>>>> remotes/origin/upstream
 #: src/lib/elm_radio.c:231 src/lib/elm_radio.c:297
 msgid "State: On"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_check.c:322 src/lib/elm_check.c:325 src/lib/elm_check.c:412
-=======
 #: src/lib/elm_check.c:324 src/lib/elm_check.c:327 src/lib/elm_check.c:414
->>>>>>> remotes/origin/upstream
 #: src/lib/elm_radio.c:298
 msgid "State: Off"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_check.c:399 src/lib/elm_check.c:409
-msgid "State"
-msgstr ""
-
-#: src/lib/elm_check.c:462
-msgid "Check"
-msgstr ""
-
-#: src/lib/elm_config.c:1354
-msgid "default:LTR"
-msgstr "default:RTL"
-
-#: src/lib/elm_datefield.c:412
-msgid "PM"
-msgstr ""
-
-#: src/lib/elm_datefield.c:413
-msgid "AM"
-msgstr ""
-
-#: src/lib/elm_datefield.c:740
-msgid "DateTimeFormat"
-msgstr ""
-
-#: src/lib/elm_entry.c:1462
-msgid "Copy"
-msgstr ""
-
-#: src/lib/elm_entry.c:1465
-msgid "Cut"
-msgstr ""
-
-#: src/lib/elm_entry.c:1479
-msgid "Select"
-msgstr ""
-
-#: src/lib/elm_entry.c:1485
-=======
 #: src/lib/elm_check.c:401 src/lib/elm_check.c:411
 msgid "State"
 msgstr ""
@@ -155,7 +86,6 @@ msgid "Select"
 msgstr ""
 
 #: src/lib/elm_entry.c:1374
->>>>>>> remotes/origin/upstream
 msgid "Paste"
 msgstr ""
 
@@ -163,13 +93,6 @@ msgstr ""
 msgid "Radio"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_searchbar.c:199
-msgid "Search"
-msgstr ""
-
-=======
->>>>>>> remotes/origin/upstream
 #: src/lib/elm_toggle.c:11
 msgid "ON"
 msgstr ""
@@ -178,25 +101,6 @@ msgstr ""
 msgid "OFF"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_toolbar.c:676
-msgid "Selected"
-msgstr ""
-
-#: src/lib/elm_toolbar.c:757
-msgid "Separator"
-msgstr ""
-
-#: src/lib/elm_toolbar.c:761
-msgid "State: Selected"
-msgstr ""
-
-#: src/lib/elm_toolbar.c:763
-msgid "Has menu"
-msgstr ""
-
-#: src/lib/elm_toolbar.c:821
-=======
 #: src/lib/elm_toolbar.c:802
 msgid "Selected"
 msgstr ""
@@ -214,6 +118,5 @@ msgid "Has menu"
 msgstr ""
 
 #: src/lib/elm_toolbar.c:954
->>>>>>> remotes/origin/upstream
 msgid "Tool Item"
 msgstr ""
index 99396f9..1f02db2 100644 (file)
@@ -2,20 +2,12 @@
 # This file is distributed under the same license as the Elementary package.
 # FIRST AUTHOR <tom.hacohen@partner.samsung.com>, 2010.
 #
-<<<<<<< HEAD
-#: src/lib/elm_config.c:1417
-=======
 #: src/lib/elm_config.c:1943
->>>>>>> remotes/origin/upstream
 msgid ""
 msgstr ""
 "Project-Id-Version: elementary\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2012-02-05 10:59+0900\n"
-=======
 "POT-Creation-Date: 2012-03-08 01:42+0900\n"
->>>>>>> remotes/origin/upstream
 "PO-Revision-Date: 2010-12-26 10:05+0200\n"
 "Last-Translator: Tom Hacohen <tom.hacohen@partner.samsung.com>\n"
 "Language-Team: General\n"
@@ -33,20 +25,11 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elc_fileselector.c:1001 src/lib/elm_entry.c:1468
-#: src/lib/elm_searchbar.c:211
-msgid "Cancel"
-msgstr ""
-
-#: src/lib/elc_fileselector.c:1011
-=======
 #: src/lib/elc_fileselector.c:1009 src/lib/elm_entry.c:1357
 msgid "Cancel"
 msgstr ""
 
 #: src/lib/elc_fileselector.c:1019
->>>>>>> remotes/origin/upstream
 msgid "OK"
 msgstr ""
 
@@ -54,13 +37,8 @@ msgstr ""
 msgid "Clicked"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_button.c:408 src/lib/elm_check.c:392 src/lib/elm_radio.c:295
-#: src/lib/elm_toolbar.c:759
-=======
 #: src/lib/elm_button.c:408 src/lib/elm_check.c:394 src/lib/elm_radio.c:295
 #: src/lib/elm_toolbar.c:886
->>>>>>> remotes/origin/upstream
 msgid "State: Disabled"
 msgstr ""
 
@@ -72,63 +50,16 @@ msgstr ""
 msgid "%B %Y"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_check.c:309 src/lib/elm_check.c:312 src/lib/elm_check.c:403
-=======
 #: src/lib/elm_check.c:311 src/lib/elm_check.c:314 src/lib/elm_check.c:405
->>>>>>> remotes/origin/upstream
 #: src/lib/elm_radio.c:231 src/lib/elm_radio.c:297
 msgid "State: On"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_check.c:322 src/lib/elm_check.c:325 src/lib/elm_check.c:412
-=======
 #: src/lib/elm_check.c:324 src/lib/elm_check.c:327 src/lib/elm_check.c:414
->>>>>>> remotes/origin/upstream
 #: src/lib/elm_radio.c:298
 msgid "State: Off"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_check.c:399 src/lib/elm_check.c:409
-msgid "State"
-msgstr ""
-
-#: src/lib/elm_check.c:462
-msgid "Check"
-msgstr ""
-
-#: src/lib/elm_config.c:1354
-msgid "default:LTR"
-msgstr "default:RTL"
-
-#: src/lib/elm_datefield.c:412
-msgid "PM"
-msgstr ""
-
-#: src/lib/elm_datefield.c:413
-msgid "AM"
-msgstr ""
-
-#: src/lib/elm_datefield.c:740
-msgid "DateTimeFormat"
-msgstr ""
-
-#: src/lib/elm_entry.c:1462
-msgid "Copy"
-msgstr ""
-
-#: src/lib/elm_entry.c:1465
-msgid "Cut"
-msgstr ""
-
-#: src/lib/elm_entry.c:1479
-msgid "Select"
-msgstr ""
-
-#: src/lib/elm_entry.c:1485
-=======
 #: src/lib/elm_check.c:401 src/lib/elm_check.c:411
 msgid "State"
 msgstr ""
@@ -154,7 +85,6 @@ msgid "Select"
 msgstr ""
 
 #: src/lib/elm_entry.c:1374
->>>>>>> remotes/origin/upstream
 msgid "Paste"
 msgstr ""
 
@@ -162,13 +92,6 @@ msgstr ""
 msgid "Radio"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_searchbar.c:199
-msgid "Search"
-msgstr ""
-
-=======
->>>>>>> remotes/origin/upstream
 #: src/lib/elm_toggle.c:11
 msgid "ON"
 msgstr ""
@@ -177,25 +100,6 @@ msgstr ""
 msgid "OFF"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_toolbar.c:676
-msgid "Selected"
-msgstr ""
-
-#: src/lib/elm_toolbar.c:757
-msgid "Separator"
-msgstr ""
-
-#: src/lib/elm_toolbar.c:761
-msgid "State: Selected"
-msgstr ""
-
-#: src/lib/elm_toolbar.c:763
-msgid "Has menu"
-msgstr ""
-
-#: src/lib/elm_toolbar.c:821
-=======
 #: src/lib/elm_toolbar.c:802
 msgid "Selected"
 msgstr ""
@@ -213,6 +117,5 @@ msgid "Has menu"
 msgstr ""
 
 #: src/lib/elm_toolbar.c:954
->>>>>>> remotes/origin/upstream
 msgid "Tool Item"
 msgstr ""
index b9d7e4b..2286a24 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,20 +1,12 @@
 # Header entry was created by Lokalize.
 #
 # Vít Pelčák <vit@pelcak.org>, 2011.
-<<<<<<< HEAD
-#: src/lib/elm_config.c:1417
-=======
 #: src/lib/elm_config.c:1943
->>>>>>> remotes/origin/upstream
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2012-02-05 10:59+0900\n"
-=======
 "POT-Creation-Date: 2012-03-08 01:42+0900\n"
->>>>>>> remotes/origin/upstream
 "PO-Revision-Date: 2011-10-23 01:31+0100\n"
 "Last-Translator: Daniel Kolesa <quaker66@gmail.com>\n"
 "Language-Team: Czech <kde-i18n-doc@kde.org>\n"
@@ -33,20 +25,11 @@ msgstr "Nahoru"
 msgid "Home"
 msgstr "Domů"
 
-<<<<<<< HEAD
-#: src/lib/elc_fileselector.c:1001 src/lib/elm_entry.c:1468
-#: src/lib/elm_searchbar.c:211
-msgid "Cancel"
-msgstr "Zrušit"
-
-#: src/lib/elc_fileselector.c:1011
-=======
 #: src/lib/elc_fileselector.c:1009 src/lib/elm_entry.c:1357
 msgid "Cancel"
 msgstr "Zrušit"
 
 #: src/lib/elc_fileselector.c:1019
->>>>>>> remotes/origin/upstream
 msgid "OK"
 msgstr "OK"
 
@@ -54,13 +37,8 @@ msgstr "OK"
 msgid "Clicked"
 msgstr "Kliknuto"
 
-<<<<<<< HEAD
-#: src/lib/elm_button.c:408 src/lib/elm_check.c:392 src/lib/elm_radio.c:295
-#: src/lib/elm_toolbar.c:759
-=======
 #: src/lib/elm_button.c:408 src/lib/elm_check.c:394 src/lib/elm_radio.c:295
 #: src/lib/elm_toolbar.c:886
->>>>>>> remotes/origin/upstream
 msgid "State: Disabled"
 msgstr "Stav: Zakázáno"
 
@@ -72,63 +50,16 @@ msgstr "Tlačítko"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-<<<<<<< HEAD
-#: src/lib/elm_check.c:309 src/lib/elm_check.c:312 src/lib/elm_check.c:403
-=======
 #: src/lib/elm_check.c:311 src/lib/elm_check.c:314 src/lib/elm_check.c:405
->>>>>>> remotes/origin/upstream
 #: src/lib/elm_radio.c:231 src/lib/elm_radio.c:297
 msgid "State: On"
 msgstr "Stav: Zapnuto"
 
-<<<<<<< HEAD
-#: src/lib/elm_check.c:322 src/lib/elm_check.c:325 src/lib/elm_check.c:412
-=======
 #: src/lib/elm_check.c:324 src/lib/elm_check.c:327 src/lib/elm_check.c:414
->>>>>>> remotes/origin/upstream
 #: src/lib/elm_radio.c:298
 msgid "State: Off"
 msgstr "Stav: Vypnuto"
 
-<<<<<<< HEAD
-#: src/lib/elm_check.c:399 src/lib/elm_check.c:409
-msgid "State"
-msgstr "Stav"
-
-#: src/lib/elm_check.c:462
-msgid "Check"
-msgstr "Ověřit"
-
-#: src/lib/elm_config.c:1354
-msgid "default:LTR"
-msgstr "výchozí:LTR"
-
-#: src/lib/elm_datefield.c:412
-msgid "PM"
-msgstr ""
-
-#: src/lib/elm_datefield.c:413
-msgid "AM"
-msgstr ""
-
-#: src/lib/elm_datefield.c:740
-msgid "DateTimeFormat"
-msgstr ""
-
-#: src/lib/elm_entry.c:1462
-msgid "Copy"
-msgstr "Kopírovat"
-
-#: src/lib/elm_entry.c:1465
-msgid "Cut"
-msgstr "Vyjmout"
-
-#: src/lib/elm_entry.c:1479
-msgid "Select"
-msgstr "Vybrat"
-
-#: src/lib/elm_entry.c:1485
-=======
 #: src/lib/elm_check.c:401 src/lib/elm_check.c:411
 msgid "State"
 msgstr "Stav"
@@ -154,7 +85,6 @@ msgid "Select"
 msgstr "Vybrat"
 
 #: src/lib/elm_entry.c:1374
->>>>>>> remotes/origin/upstream
 msgid "Paste"
 msgstr "Vložit"
 
@@ -162,13 +92,6 @@ msgstr "Vložit"
 msgid "Radio"
 msgstr "Přepínač"
 
-<<<<<<< HEAD
-#: src/lib/elm_searchbar.c:199
-msgid "Search"
-msgstr ""
-
-=======
->>>>>>> remotes/origin/upstream
 #: src/lib/elm_toggle.c:11
 msgid "ON"
 msgstr "ZAPNUTO"
@@ -177,25 +100,6 @@ msgstr "ZAPNUTO"
 msgid "OFF"
 msgstr "VYPNUTO"
 
-<<<<<<< HEAD
-#: src/lib/elm_toolbar.c:676
-msgid "Selected"
-msgstr "Vybrané"
-
-#: src/lib/elm_toolbar.c:757
-msgid "Separator"
-msgstr "Oddělovač"
-
-#: src/lib/elm_toolbar.c:761
-msgid "State: Selected"
-msgstr "Stav: Vybráno"
-
-#: src/lib/elm_toolbar.c:763
-msgid "Has menu"
-msgstr "Má nabídku"
-
-#: src/lib/elm_toolbar.c:821
-=======
 #: src/lib/elm_toolbar.c:802
 msgid "Selected"
 msgstr "Vybrané"
@@ -213,6 +117,5 @@ msgid "Has menu"
 msgstr "Má nabídku"
 
 #: src/lib/elm_toolbar.c:954
->>>>>>> remotes/origin/upstream
 msgid "Tool Item"
 msgstr "Položka nástrojů"
index 457746c..eee9f14 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -4,20 +4,12 @@
 # This file is distributed under the same license as the elementary package.
 # Fabian Nowak <timystery@arcor.de>, 2011.
 #
-<<<<<<< HEAD
-#: src/lib/elm_config.c:1417
-=======
 #: src/lib/elm_config.c:1943
->>>>>>> remotes/origin/upstream
 msgid ""
 msgstr ""
 "Project-Id-Version: elementary 0.7.0.57309\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2012-02-05 10:59+0900\n"
-=======
 "POT-Creation-Date: 2012-03-08 01:42+0900\n"
->>>>>>> remotes/origin/upstream
 "PO-Revision-Date: 2011-02-25 20:22+0100\n"
 "Last-Translator: Fabian Nowak <timystery@arcor.de>\n"
 "Language-Team: German\n"
@@ -35,20 +27,11 @@ msgstr "Aufwärts"
 msgid "Home"
 msgstr "Persönlicher Ordner"
 
-<<<<<<< HEAD
-#: src/lib/elc_fileselector.c:1001 src/lib/elm_entry.c:1468
-#: src/lib/elm_searchbar.c:211
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: src/lib/elc_fileselector.c:1011
-=======
 #: src/lib/elc_fileselector.c:1009 src/lib/elm_entry.c:1357
 msgid "Cancel"
 msgstr "Abbrechen"
 
 #: src/lib/elc_fileselector.c:1019
->>>>>>> remotes/origin/upstream
 msgid "OK"
 msgstr "OK"
 
@@ -56,13 +39,8 @@ msgstr "OK"
 msgid "Clicked"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_button.c:408 src/lib/elm_check.c:392 src/lib/elm_radio.c:295
-#: src/lib/elm_toolbar.c:759
-=======
 #: src/lib/elm_button.c:408 src/lib/elm_check.c:394 src/lib/elm_radio.c:295
 #: src/lib/elm_toolbar.c:886
->>>>>>> remotes/origin/upstream
 msgid "State: Disabled"
 msgstr ""
 
@@ -74,63 +52,16 @@ msgstr ""
 msgid "%B %Y"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_check.c:309 src/lib/elm_check.c:312 src/lib/elm_check.c:403
-=======
 #: src/lib/elm_check.c:311 src/lib/elm_check.c:314 src/lib/elm_check.c:405
->>>>>>> remotes/origin/upstream
 #: src/lib/elm_radio.c:231 src/lib/elm_radio.c:297
 msgid "State: On"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_check.c:322 src/lib/elm_check.c:325 src/lib/elm_check.c:412
-=======
 #: src/lib/elm_check.c:324 src/lib/elm_check.c:327 src/lib/elm_check.c:414
->>>>>>> remotes/origin/upstream
 #: src/lib/elm_radio.c:298
 msgid "State: Off"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_check.c:399 src/lib/elm_check.c:409
-msgid "State"
-msgstr ""
-
-#: src/lib/elm_check.c:462
-msgid "Check"
-msgstr ""
-
-#: src/lib/elm_config.c:1354
-msgid "default:LTR"
-msgstr "Standard: LTR"
-
-#: src/lib/elm_datefield.c:412
-msgid "PM"
-msgstr ""
-
-#: src/lib/elm_datefield.c:413
-msgid "AM"
-msgstr ""
-
-#: src/lib/elm_datefield.c:740
-msgid "DateTimeFormat"
-msgstr ""
-
-#: src/lib/elm_entry.c:1462
-msgid "Copy"
-msgstr "Kopieren"
-
-#: src/lib/elm_entry.c:1465
-msgid "Cut"
-msgstr "Ausschneiden"
-
-#: src/lib/elm_entry.c:1479
-msgid "Select"
-msgstr "Auswählen"
-
-#: src/lib/elm_entry.c:1485
-=======
 #: src/lib/elm_check.c:401 src/lib/elm_check.c:411
 msgid "State"
 msgstr ""
@@ -156,7 +87,6 @@ msgid "Select"
 msgstr "Auswählen"
 
 #: src/lib/elm_entry.c:1374
->>>>>>> remotes/origin/upstream
 msgid "Paste"
 msgstr "Einfügen"
 
@@ -164,13 +94,6 @@ msgstr "Einfügen"
 msgid "Radio"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_searchbar.c:199
-msgid "Search"
-msgstr ""
-
-=======
->>>>>>> remotes/origin/upstream
 #: src/lib/elm_toggle.c:11
 msgid "ON"
 msgstr ""
@@ -179,30 +102,11 @@ msgstr ""
 msgid "OFF"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_toolbar.c:676
-=======
 #: src/lib/elm_toolbar.c:802
->>>>>>> remotes/origin/upstream
 #, fuzzy
 msgid "Selected"
 msgstr "Auswählen"
 
-<<<<<<< HEAD
-#: src/lib/elm_toolbar.c:757
-msgid "Separator"
-msgstr ""
-
-#: src/lib/elm_toolbar.c:761
-msgid "State: Selected"
-msgstr ""
-
-#: src/lib/elm_toolbar.c:763
-msgid "Has menu"
-msgstr ""
-
-#: src/lib/elm_toolbar.c:821
-=======
 #: src/lib/elm_toolbar.c:884
 msgid "Separator"
 msgstr ""
@@ -216,6 +120,5 @@ msgid "Has menu"
 msgstr ""
 
 #: src/lib/elm_toolbar.c:954
->>>>>>> remotes/origin/upstream
 msgid "Tool Item"
 msgstr ""
index 99396f9..1f02db2 100644 (file)
--- a/po/fa.po
+++ b/po/fa.po
@@ -2,20 +2,12 @@
 # This file is distributed under the same license as the Elementary package.
 # FIRST AUTHOR <tom.hacohen@partner.samsung.com>, 2010.
 #
-<<<<<<< HEAD
-#: src/lib/elm_config.c:1417
-=======
 #: src/lib/elm_config.c:1943
->>>>>>> remotes/origin/upstream
 msgid ""
 msgstr ""
 "Project-Id-Version: elementary\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2012-02-05 10:59+0900\n"
-=======
 "POT-Creation-Date: 2012-03-08 01:42+0900\n"
->>>>>>> remotes/origin/upstream
 "PO-Revision-Date: 2010-12-26 10:05+0200\n"
 "Last-Translator: Tom Hacohen <tom.hacohen@partner.samsung.com>\n"
 "Language-Team: General\n"
@@ -33,20 +25,11 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elc_fileselector.c:1001 src/lib/elm_entry.c:1468
-#: src/lib/elm_searchbar.c:211
-msgid "Cancel"
-msgstr ""
-
-#: src/lib/elc_fileselector.c:1011
-=======
 #: src/lib/elc_fileselector.c:1009 src/lib/elm_entry.c:1357
 msgid "Cancel"
 msgstr ""
 
 #: src/lib/elc_fileselector.c:1019
->>>>>>> remotes/origin/upstream
 msgid "OK"
 msgstr ""
 
@@ -54,13 +37,8 @@ msgstr ""
 msgid "Clicked"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_button.c:408 src/lib/elm_check.c:392 src/lib/elm_radio.c:295
-#: src/lib/elm_toolbar.c:759
-=======
 #: src/lib/elm_button.c:408 src/lib/elm_check.c:394 src/lib/elm_radio.c:295
 #: src/lib/elm_toolbar.c:886
->>>>>>> remotes/origin/upstream
 msgid "State: Disabled"
 msgstr ""
 
@@ -72,63 +50,16 @@ msgstr ""
 msgid "%B %Y"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_check.c:309 src/lib/elm_check.c:312 src/lib/elm_check.c:403
-=======
 #: src/lib/elm_check.c:311 src/lib/elm_check.c:314 src/lib/elm_check.c:405
->>>>>>> remotes/origin/upstream
 #: src/lib/elm_radio.c:231 src/lib/elm_radio.c:297
 msgid "State: On"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_check.c:322 src/lib/elm_check.c:325 src/lib/elm_check.c:412
-=======
 #: src/lib/elm_check.c:324 src/lib/elm_check.c:327 src/lib/elm_check.c:414
->>>>>>> remotes/origin/upstream
 #: src/lib/elm_radio.c:298
 msgid "State: Off"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_check.c:399 src/lib/elm_check.c:409
-msgid "State"
-msgstr ""
-
-#: src/lib/elm_check.c:462
-msgid "Check"
-msgstr ""
-
-#: src/lib/elm_config.c:1354
-msgid "default:LTR"
-msgstr "default:RTL"
-
-#: src/lib/elm_datefield.c:412
-msgid "PM"
-msgstr ""
-
-#: src/lib/elm_datefield.c:413
-msgid "AM"
-msgstr ""
-
-#: src/lib/elm_datefield.c:740
-msgid "DateTimeFormat"
-msgstr ""
-
-#: src/lib/elm_entry.c:1462
-msgid "Copy"
-msgstr ""
-
-#: src/lib/elm_entry.c:1465
-msgid "Cut"
-msgstr ""
-
-#: src/lib/elm_entry.c:1479
-msgid "Select"
-msgstr ""
-
-#: src/lib/elm_entry.c:1485
-=======
 #: src/lib/elm_check.c:401 src/lib/elm_check.c:411
 msgid "State"
 msgstr ""
@@ -154,7 +85,6 @@ msgid "Select"
 msgstr ""
 
 #: src/lib/elm_entry.c:1374
->>>>>>> remotes/origin/upstream
 msgid "Paste"
 msgstr ""
 
@@ -162,13 +92,6 @@ msgstr ""
 msgid "Radio"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_searchbar.c:199
-msgid "Search"
-msgstr ""
-
-=======
->>>>>>> remotes/origin/upstream
 #: src/lib/elm_toggle.c:11
 msgid "ON"
 msgstr ""
@@ -177,25 +100,6 @@ msgstr ""
 msgid "OFF"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_toolbar.c:676
-msgid "Selected"
-msgstr ""
-
-#: src/lib/elm_toolbar.c:757
-msgid "Separator"
-msgstr ""
-
-#: src/lib/elm_toolbar.c:761
-msgid "State: Selected"
-msgstr ""
-
-#: src/lib/elm_toolbar.c:763
-msgid "Has menu"
-msgstr ""
-
-#: src/lib/elm_toolbar.c:821
-=======
 #: src/lib/elm_toolbar.c:802
 msgid "Selected"
 msgstr ""
@@ -213,6 +117,5 @@ msgid "Has menu"
 msgstr ""
 
 #: src/lib/elm_toolbar.c:954
->>>>>>> remotes/origin/upstream
 msgid "Tool Item"
 msgstr ""
index 2349415..f7884ff 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -3,20 +3,12 @@
 # batden <batden@orange.fr>, 2011.
 # dazibao <dazibao@sfr.fr>, 2011.
 #
-<<<<<<< HEAD
-#: src/lib/elm_config.c:1417
-=======
 #: src/lib/elm_config.c:1943
->>>>>>> remotes/origin/upstream
 msgid ""
 msgstr ""
 "Project-Id-Version: Elementary\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2012-02-05 10:59+0900\n"
-=======
 "POT-Creation-Date: 2012-03-08 01:42+0900\n"
->>>>>>> remotes/origin/upstream
 "PO-Revision-Date: 2011-11-08 07:57+0100\n"
 "Last-Translator: dazibao <dazibao@sfr.fr>\n"
 "Language-Team: French <sansgourou@gmail.com>\n"
@@ -37,20 +29,11 @@ msgstr "Monter"
 msgid "Home"
 msgstr "Home"
 
-<<<<<<< HEAD
-#: src/lib/elc_fileselector.c:1001 src/lib/elm_entry.c:1468
-#: src/lib/elm_searchbar.c:211
-msgid "Cancel"
-msgstr "Annuler"
-
-#: src/lib/elc_fileselector.c:1011
-=======
 #: src/lib/elc_fileselector.c:1009 src/lib/elm_entry.c:1357
 msgid "Cancel"
 msgstr "Annuler"
 
 #: src/lib/elc_fileselector.c:1019
->>>>>>> remotes/origin/upstream
 msgid "OK"
 msgstr "OK"
 
@@ -58,13 +41,8 @@ msgstr "OK"
 msgid "Clicked"
 msgstr "Cliqué"
 
-<<<<<<< HEAD
-#: src/lib/elm_button.c:408 src/lib/elm_check.c:392 src/lib/elm_radio.c:295
-#: src/lib/elm_toolbar.c:759
-=======
 #: src/lib/elm_button.c:408 src/lib/elm_check.c:394 src/lib/elm_radio.c:295
 #: src/lib/elm_toolbar.c:886
->>>>>>> remotes/origin/upstream
 msgid "State: Disabled"
 msgstr "État : désactivé"
 
@@ -76,63 +54,16 @@ msgstr "Bouton"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-<<<<<<< HEAD
-#: src/lib/elm_check.c:309 src/lib/elm_check.c:312 src/lib/elm_check.c:403
-=======
 #: src/lib/elm_check.c:311 src/lib/elm_check.c:314 src/lib/elm_check.c:405
->>>>>>> remotes/origin/upstream
 #: src/lib/elm_radio.c:231 src/lib/elm_radio.c:297
 msgid "State: On"
 msgstr "État : activé"
 
-<<<<<<< HEAD
-#: src/lib/elm_check.c:322 src/lib/elm_check.c:325 src/lib/elm_check.c:412
-=======
 #: src/lib/elm_check.c:324 src/lib/elm_check.c:327 src/lib/elm_check.c:414
->>>>>>> remotes/origin/upstream
 #: src/lib/elm_radio.c:298
 msgid "State: Off"
 msgstr "État : désactivé"
 
-<<<<<<< HEAD
-#: src/lib/elm_check.c:399 src/lib/elm_check.c:409
-msgid "State"
-msgstr "État"
-
-#: src/lib/elm_check.c:462
-msgid "Check"
-msgstr "À cocher"
-
-#: src/lib/elm_config.c:1354
-msgid "default:LTR"
-msgstr "LTR par défaut"
-
-#: src/lib/elm_datefield.c:412
-msgid "PM"
-msgstr ""
-
-#: src/lib/elm_datefield.c:413
-msgid "AM"
-msgstr ""
-
-#: src/lib/elm_datefield.c:740
-msgid "DateTimeFormat"
-msgstr ""
-
-#: src/lib/elm_entry.c:1462
-msgid "Copy"
-msgstr "Copier"
-
-#: src/lib/elm_entry.c:1465
-msgid "Cut"
-msgstr "Couper"
-
-#: src/lib/elm_entry.c:1479
-msgid "Select"
-msgstr "Sélectionner"
-
-#: src/lib/elm_entry.c:1485
-=======
 #: src/lib/elm_check.c:401 src/lib/elm_check.c:411
 msgid "State"
 msgstr "État"
@@ -158,7 +89,6 @@ msgid "Select"
 msgstr "Sélectionner"
 
 #: src/lib/elm_entry.c:1374
->>>>>>> remotes/origin/upstream
 msgid "Paste"
 msgstr "Coller"
 
@@ -166,13 +96,6 @@ msgstr "Coller"
 msgid "Radio"
 msgstr "Radio"
 
-<<<<<<< HEAD
-#: src/lib/elm_searchbar.c:199
-msgid "Search"
-msgstr ""
-
-=======
->>>>>>> remotes/origin/upstream
 #: src/lib/elm_toggle.c:11
 msgid "ON"
 msgstr "OUI"
@@ -181,25 +104,6 @@ msgstr "OUI"
 msgid "OFF"
 msgstr "NON"
 
-<<<<<<< HEAD
-#: src/lib/elm_toolbar.c:676
-msgid "Selected"
-msgstr "Sélectionné"
-
-#: src/lib/elm_toolbar.c:757
-msgid "Separator"
-msgstr "Séparateur"
-
-#: src/lib/elm_toolbar.c:761
-msgid "State: Selected"
-msgstr "État : sélectionné"
-
-#: src/lib/elm_toolbar.c:763
-msgid "Has menu"
-msgstr "Possède un menu"
-
-#: src/lib/elm_toolbar.c:821
-=======
 #: src/lib/elm_toolbar.c:802
 msgid "Selected"
 msgstr "Sélectionné"
@@ -217,6 +121,5 @@ msgid "Has menu"
 msgstr "Possède un menu"
 
 #: src/lib/elm_toolbar.c:954
->>>>>>> remotes/origin/upstream
 msgid "Tool Item"
 msgstr "Élément outil"
index aa71b4c..8489f37 100644 (file)
--- a/po/he.po
+++ b/po/he.po
@@ -2,20 +2,12 @@
 # This file is distributed under the same license as the Elementary package.
 # FIRST AUTHOR <a.hillel@partner.samsung.com>, 2010.
 #
-<<<<<<< HEAD
-#: src/lib/elm_config.c:1417
-=======
 #: src/lib/elm_config.c:1943
->>>>>>> remotes/origin/upstream
 msgid ""
 msgstr ""
 "Project-Id-Version: elementary\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2012-02-05 10:59+0900\n"
-=======
 "POT-Creation-Date: 2012-03-08 01:42+0900\n"
->>>>>>> remotes/origin/upstream
 "PO-Revision-Date: 2010-12-26 10:05+0200\n"
 "Last-Translator: Aharon Hillel <a.hillel@partner.samsung.com>\n"
 "Language-Team: General\n"
@@ -33,20 +25,11 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elc_fileselector.c:1001 src/lib/elm_entry.c:1468
-#: src/lib/elm_searchbar.c:211
-msgid "Cancel"
-msgstr "בטל"
-
-#: src/lib/elc_fileselector.c:1011
-=======
 #: src/lib/elc_fileselector.c:1009 src/lib/elm_entry.c:1357
 msgid "Cancel"
 msgstr "בטל"
 
 #: src/lib/elc_fileselector.c:1019
->>>>>>> remotes/origin/upstream
 msgid "OK"
 msgstr "אשר"
 
@@ -54,13 +37,8 @@ msgstr "אשר"
 msgid "Clicked"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_button.c:408 src/lib/elm_check.c:392 src/lib/elm_radio.c:295
-#: src/lib/elm_toolbar.c:759
-=======
 #: src/lib/elm_button.c:408 src/lib/elm_check.c:394 src/lib/elm_radio.c:295
 #: src/lib/elm_toolbar.c:886
->>>>>>> remotes/origin/upstream
 msgid "State: Disabled"
 msgstr ""
 
@@ -72,63 +50,16 @@ msgstr ""
 msgid "%B %Y"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_check.c:309 src/lib/elm_check.c:312 src/lib/elm_check.c:403
-=======
 #: src/lib/elm_check.c:311 src/lib/elm_check.c:314 src/lib/elm_check.c:405
->>>>>>> remotes/origin/upstream
 #: src/lib/elm_radio.c:231 src/lib/elm_radio.c:297
 msgid "State: On"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_check.c:322 src/lib/elm_check.c:325 src/lib/elm_check.c:412
-=======
 #: src/lib/elm_check.c:324 src/lib/elm_check.c:327 src/lib/elm_check.c:414
->>>>>>> remotes/origin/upstream
 #: src/lib/elm_radio.c:298
 msgid "State: Off"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_check.c:399 src/lib/elm_check.c:409
-msgid "State"
-msgstr ""
-
-#: src/lib/elm_check.c:462
-msgid "Check"
-msgstr ""
-
-#: src/lib/elm_config.c:1354
-msgid "default:LTR"
-msgstr "default:RTL"
-
-#: src/lib/elm_datefield.c:412
-msgid "PM"
-msgstr ""
-
-#: src/lib/elm_datefield.c:413
-msgid "AM"
-msgstr ""
-
-#: src/lib/elm_datefield.c:740
-msgid "DateTimeFormat"
-msgstr ""
-
-#: src/lib/elm_entry.c:1462
-msgid "Copy"
-msgstr "העתק"
-
-#: src/lib/elm_entry.c:1465
-msgid "Cut"
-msgstr "גזור"
-
-#: src/lib/elm_entry.c:1479
-msgid "Select"
-msgstr "התחל בחירה"
-
-#: src/lib/elm_entry.c:1485
-=======
 #: src/lib/elm_check.c:401 src/lib/elm_check.c:411
 msgid "State"
 msgstr ""
@@ -154,7 +85,6 @@ msgid "Select"
 msgstr "התחל בחירה"
 
 #: src/lib/elm_entry.c:1374
->>>>>>> remotes/origin/upstream
 msgid "Paste"
 msgstr "הדבק"
 
@@ -162,13 +92,6 @@ msgstr "הדבק"
 msgid "Radio"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_searchbar.c:199
-msgid "Search"
-msgstr ""
-
-=======
->>>>>>> remotes/origin/upstream
 #: src/lib/elm_toggle.c:11
 msgid "ON"
 msgstr ""
@@ -177,30 +100,11 @@ msgstr ""
 msgid "OFF"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_toolbar.c:676
-=======
 #: src/lib/elm_toolbar.c:802
->>>>>>> remotes/origin/upstream
 #, fuzzy
 msgid "Selected"
 msgstr "התחל בחירה"
 
-<<<<<<< HEAD
-#: src/lib/elm_toolbar.c:757
-msgid "Separator"
-msgstr ""
-
-#: src/lib/elm_toolbar.c:761
-msgid "State: Selected"
-msgstr ""
-
-#: src/lib/elm_toolbar.c:763
-msgid "Has menu"
-msgstr ""
-
-#: src/lib/elm_toolbar.c:821
-=======
 #: src/lib/elm_toolbar.c:884
 msgid "Separator"
 msgstr ""
@@ -214,6 +118,5 @@ msgid "Has menu"
 msgstr ""
 
 #: src/lib/elm_toolbar.c:954
->>>>>>> remotes/origin/upstream
 msgid "Tool Item"
 msgstr ""
index 118b581..1de9182 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -1,20 +1,12 @@
 # Italian translation for Elementary.
 # This file is put in the public domain.
 # Massimo Maiurana <maiurana@gmail.com>, 2011.
-<<<<<<< HEAD
-#: src/lib/elm_config.c:1417
-=======
 #: src/lib/elm_config.c:1943
->>>>>>> remotes/origin/upstream
 msgid ""
 msgstr ""
 "Project-Id-Version: Elementary\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2012-02-05 10:59+0900\n"
-=======
 "POT-Creation-Date: 2012-03-08 01:42+0900\n"
->>>>>>> remotes/origin/upstream
 "PO-Revision-Date: 2011-11-08 14:19+0100\n"
 "Last-Translator: Massimo Maiurana <maiurana@gmail.com>\n"
 "Language-Team: none\n"
@@ -31,20 +23,11 @@ msgstr "Su"
 msgid "Home"
 msgstr "Home"
 
-<<<<<<< HEAD
-#: src/lib/elc_fileselector.c:1001 src/lib/elm_entry.c:1468
-#: src/lib/elm_searchbar.c:211
-msgid "Cancel"
-msgstr "Annulla"
-
-#: src/lib/elc_fileselector.c:1011
-=======
 #: src/lib/elc_fileselector.c:1009 src/lib/elm_entry.c:1357
 msgid "Cancel"
 msgstr "Annulla"
 
 #: src/lib/elc_fileselector.c:1019
->>>>>>> remotes/origin/upstream
 msgid "OK"
 msgstr "OK"
 
@@ -52,13 +35,8 @@ msgstr "OK"
 msgid "Clicked"
 msgstr "Cliccato"
 
-<<<<<<< HEAD
-#: src/lib/elm_button.c:408 src/lib/elm_check.c:392 src/lib/elm_radio.c:295
-#: src/lib/elm_toolbar.c:759
-=======
 #: src/lib/elm_button.c:408 src/lib/elm_check.c:394 src/lib/elm_radio.c:295
 #: src/lib/elm_toolbar.c:886
->>>>>>> remotes/origin/upstream
 msgid "State: Disabled"
 msgstr "Stato: disabilitato"
 
@@ -70,63 +48,16 @@ msgstr "Bottone"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-<<<<<<< HEAD
-#: src/lib/elm_check.c:309 src/lib/elm_check.c:312 src/lib/elm_check.c:403
-=======
 #: src/lib/elm_check.c:311 src/lib/elm_check.c:314 src/lib/elm_check.c:405
->>>>>>> remotes/origin/upstream
 #: src/lib/elm_radio.c:231 src/lib/elm_radio.c:297
 msgid "State: On"
 msgstr "Stato: attivo"
 
-<<<<<<< HEAD
-#: src/lib/elm_check.c:322 src/lib/elm_check.c:325 src/lib/elm_check.c:412
-=======
 #: src/lib/elm_check.c:324 src/lib/elm_check.c:327 src/lib/elm_check.c:414
->>>>>>> remotes/origin/upstream
 #: src/lib/elm_radio.c:298
 msgid "State: Off"
 msgstr "Stato: inattivo"
 
-<<<<<<< HEAD
-#: src/lib/elm_check.c:399 src/lib/elm_check.c:409
-msgid "State"
-msgstr "Stato"
-
-#: src/lib/elm_check.c:462
-msgid "Check"
-msgstr "Controllo"
-
-#: src/lib/elm_config.c:1354
-msgid "default:LTR"
-msgstr "predefintito: LTR"
-
-#: src/lib/elm_datefield.c:412
-msgid "PM"
-msgstr ""
-
-#: src/lib/elm_datefield.c:413
-msgid "AM"
-msgstr ""
-
-#: src/lib/elm_datefield.c:740
-msgid "DateTimeFormat"
-msgstr ""
-
-#: src/lib/elm_entry.c:1462
-msgid "Copy"
-msgstr "Copia"
-
-#: src/lib/elm_entry.c:1465
-msgid "Cut"
-msgstr "Taglia"
-
-#: src/lib/elm_entry.c:1479
-msgid "Select"
-msgstr "Seleziona"
-
-#: src/lib/elm_entry.c:1485
-=======
 #: src/lib/elm_check.c:401 src/lib/elm_check.c:411
 msgid "State"
 msgstr "Stato"
@@ -152,7 +83,6 @@ msgid "Select"
 msgstr "Seleziona"
 
 #: src/lib/elm_entry.c:1374
->>>>>>> remotes/origin/upstream
 msgid "Paste"
 msgstr "Incolla"
 
@@ -160,13 +90,6 @@ msgstr "Incolla"
 msgid "Radio"
 msgstr "Opzione"
 
-<<<<<<< HEAD
-#: src/lib/elm_searchbar.c:199
-msgid "Search"
-msgstr ""
-
-=======
->>>>>>> remotes/origin/upstream
 #: src/lib/elm_toggle.c:11
 msgid "ON"
 msgstr "Attivo"
@@ -175,25 +98,6 @@ msgstr "Attivo"
 msgid "OFF"
 msgstr "Non attivo"
 
-<<<<<<< HEAD
-#: src/lib/elm_toolbar.c:676
-msgid "Selected"
-msgstr "Selezionato"
-
-#: src/lib/elm_toolbar.c:757
-msgid "Separator"
-msgstr "Separatore"
-
-#: src/lib/elm_toolbar.c:761
-msgid "State: Selected"
-msgstr "Stato: selezionato"
-
-#: src/lib/elm_toolbar.c:763
-msgid "Has menu"
-msgstr "Include menù"
-
-#: src/lib/elm_toolbar.c:821
-=======
 #: src/lib/elm_toolbar.c:802
 msgid "Selected"
 msgstr "Selezionato"
@@ -211,6 +115,5 @@ msgid "Has menu"
 msgstr "Include menù"
 
 #: src/lib/elm_toolbar.c:954
->>>>>>> remotes/origin/upstream
 msgid "Tool Item"
 msgstr "Oggetto strumento"
index 61d30fe..85ce3ea 100644 (file)
@@ -2,20 +2,12 @@
 # This file is distributed under the same license as the Elementary package.
 # Daniel Juyung Seo <seojuyung2@gmail.com>, 2011.
 #
-<<<<<<< HEAD
-#: src/lib/elm_config.c:1417
-=======
 #: src/lib/elm_config.c:1943
->>>>>>> remotes/origin/upstream
 msgid ""
 msgstr ""
 "Project-Id-Version: elementary\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2012-02-05 10:59+0900\n"
-=======
 "POT-Creation-Date: 2012-03-08 01:42+0900\n"
->>>>>>> remotes/origin/upstream
 "PO-Revision-Date: 2011-02-22 09:09-0800\n"
 "Last-Translator: Daniel Juyung Seo <seojuyung@gmail.com>\n"
 "Language-Team: General\n"
@@ -33,20 +25,11 @@ msgstr "위로"
 msgid "Home"
 msgstr "홈"
 
-<<<<<<< HEAD
-#: src/lib/elc_fileselector.c:1001 src/lib/elm_entry.c:1468
-#: src/lib/elm_searchbar.c:211
-msgid "Cancel"
-msgstr "취소"
-
-#: src/lib/elc_fileselector.c:1011
-=======
 #: src/lib/elc_fileselector.c:1009 src/lib/elm_entry.c:1357
 msgid "Cancel"
 msgstr "취소"
 
 #: src/lib/elc_fileselector.c:1019
->>>>>>> remotes/origin/upstream
 msgid "OK"
 msgstr "확인"
 
@@ -54,13 +37,8 @@ msgstr "확인"
 msgid "Clicked"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_button.c:408 src/lib/elm_check.c:392 src/lib/elm_radio.c:295
-#: src/lib/elm_toolbar.c:759
-=======
 #: src/lib/elm_button.c:408 src/lib/elm_check.c:394 src/lib/elm_radio.c:295
 #: src/lib/elm_toolbar.c:886
->>>>>>> remotes/origin/upstream
 msgid "State: Disabled"
 msgstr ""
 
@@ -72,63 +50,16 @@ msgstr ""
 msgid "%B %Y"
 msgstr "%Y년 %B"
 
-<<<<<<< HEAD
-#: src/lib/elm_check.c:309 src/lib/elm_check.c:312 src/lib/elm_check.c:403
-=======
 #: src/lib/elm_check.c:311 src/lib/elm_check.c:314 src/lib/elm_check.c:405
->>>>>>> remotes/origin/upstream
 #: src/lib/elm_radio.c:231 src/lib/elm_radio.c:297
 msgid "State: On"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_check.c:322 src/lib/elm_check.c:325 src/lib/elm_check.c:412
-=======
 #: src/lib/elm_check.c:324 src/lib/elm_check.c:327 src/lib/elm_check.c:414
->>>>>>> remotes/origin/upstream
 #: src/lib/elm_radio.c:298
 msgid "State: Off"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_check.c:399 src/lib/elm_check.c:409
-msgid "State"
-msgstr ""
-
-#: src/lib/elm_check.c:462
-msgid "Check"
-msgstr ""
-
-#: src/lib/elm_config.c:1354
-msgid "default:LTR"
-msgstr "default:LTR"
-
-#: src/lib/elm_datefield.c:412
-msgid "PM"
-msgstr ""
-
-#: src/lib/elm_datefield.c:413
-msgid "AM"
-msgstr ""
-
-#: src/lib/elm_datefield.c:740
-msgid "DateTimeFormat"
-msgstr ""
-
-#: src/lib/elm_entry.c:1462
-msgid "Copy"
-msgstr "복사"
-
-#: src/lib/elm_entry.c:1465
-msgid "Cut"
-msgstr "잘라내기"
-
-#: src/lib/elm_entry.c:1479
-msgid "Select"
-msgstr "선택"
-
-#: src/lib/elm_entry.c:1485
-=======
 #: src/lib/elm_check.c:401 src/lib/elm_check.c:411
 msgid "State"
 msgstr ""
@@ -154,7 +85,6 @@ msgid "Select"
 msgstr "선택"
 
 #: src/lib/elm_entry.c:1374
->>>>>>> remotes/origin/upstream
 msgid "Paste"
 msgstr "붙여넣기"
 
@@ -162,13 +92,6 @@ msgstr "붙여넣기"
 msgid "Radio"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_searchbar.c:199
-msgid "Search"
-msgstr ""
-
-=======
->>>>>>> remotes/origin/upstream
 #: src/lib/elm_toggle.c:11
 msgid "ON"
 msgstr ""
@@ -177,30 +100,11 @@ msgstr ""
 msgid "OFF"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_toolbar.c:676
-=======
 #: src/lib/elm_toolbar.c:802
->>>>>>> remotes/origin/upstream
 #, fuzzy
 msgid "Selected"
 msgstr "선택"
 
-<<<<<<< HEAD
-#: src/lib/elm_toolbar.c:757
-msgid "Separator"
-msgstr ""
-
-#: src/lib/elm_toolbar.c:761
-msgid "State: Selected"
-msgstr ""
-
-#: src/lib/elm_toolbar.c:763
-msgid "Has menu"
-msgstr ""
-
-#: src/lib/elm_toolbar.c:821
-=======
 #: src/lib/elm_toolbar.c:884
 msgid "Separator"
 msgstr ""
@@ -214,6 +118,5 @@ msgid "Has menu"
 msgstr ""
 
 #: src/lib/elm_toolbar.c:954
->>>>>>> remotes/origin/upstream
 msgid "Tool Item"
 msgstr ""
index 2aa4720..28f389b 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -4,20 +4,12 @@
 # This file is distributed under the same license as the elementary package.
 # Fabian Nowak <timystery@arcor.de>, 2011.
 #
-<<<<<<< HEAD
-#: src/lib/elm_config.c:1417
-=======
 #: src/lib/elm_config.c:1943
->>>>>>> remotes/origin/upstream
 msgid ""
 msgstr ""
 "Project-Id-Version: elementary 0.7.0.57309\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2012-02-05 10:59+0900\n"
-=======
 "POT-Creation-Date: 2012-03-08 01:42+0900\n"
->>>>>>> remotes/origin/upstream
 "PO-Revision-Date: 2011-06-19 16:41+0100\n"
 "Last-Translator: Heimen Stoffels <vistausss@gmail.com>\n"
 "Language-Team: Dutch <vistausss@gmail.com>\n"
@@ -37,20 +29,11 @@ msgstr "Omhoog"
 msgid "Home"
 msgstr "Persoonlijke map"
 
-<<<<<<< HEAD
-#: src/lib/elc_fileselector.c:1001 src/lib/elm_entry.c:1468
-#: src/lib/elm_searchbar.c:211
-msgid "Cancel"
-msgstr "Annuleren"
-
-#: src/lib/elc_fileselector.c:1011
-=======
 #: src/lib/elc_fileselector.c:1009 src/lib/elm_entry.c:1357
 msgid "Cancel"
 msgstr "Annuleren"
 
 #: src/lib/elc_fileselector.c:1019
->>>>>>> remotes/origin/upstream
 msgid "OK"
 msgstr "OK"
 
@@ -58,13 +41,8 @@ msgstr "OK"
 msgid "Clicked"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_button.c:408 src/lib/elm_check.c:392 src/lib/elm_radio.c:295
-#: src/lib/elm_toolbar.c:759
-=======
 #: src/lib/elm_button.c:408 src/lib/elm_check.c:394 src/lib/elm_radio.c:295
 #: src/lib/elm_toolbar.c:886
->>>>>>> remotes/origin/upstream
 msgid "State: Disabled"
 msgstr ""
 
@@ -76,63 +54,16 @@ msgstr ""
 msgid "%B %Y"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_check.c:309 src/lib/elm_check.c:312 src/lib/elm_check.c:403
-=======
 #: src/lib/elm_check.c:311 src/lib/elm_check.c:314 src/lib/elm_check.c:405
->>>>>>> remotes/origin/upstream
 #: src/lib/elm_radio.c:231 src/lib/elm_radio.c:297
 msgid "State: On"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_check.c:322 src/lib/elm_check.c:325 src/lib/elm_check.c:412
-=======
 #: src/lib/elm_check.c:324 src/lib/elm_check.c:327 src/lib/elm_check.c:414
->>>>>>> remotes/origin/upstream
 #: src/lib/elm_radio.c:298
 msgid "State: Off"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_check.c:399 src/lib/elm_check.c:409
-msgid "State"
-msgstr ""
-
-#: src/lib/elm_check.c:462
-msgid "Check"
-msgstr ""
-
-#: src/lib/elm_config.c:1354
-msgid "default:LTR"
-msgstr "Standaard: LTR"
-
-#: src/lib/elm_datefield.c:412
-msgid "PM"
-msgstr ""
-
-#: src/lib/elm_datefield.c:413
-msgid "AM"
-msgstr ""
-
-#: src/lib/elm_datefield.c:740
-msgid "DateTimeFormat"
-msgstr ""
-
-#: src/lib/elm_entry.c:1462
-msgid "Copy"
-msgstr "Kopiëren"
-
-#: src/lib/elm_entry.c:1465
-msgid "Cut"
-msgstr "Knippen"
-
-#: src/lib/elm_entry.c:1479
-msgid "Select"
-msgstr "Selecteren"
-
-#: src/lib/elm_entry.c:1485
-=======
 #: src/lib/elm_check.c:401 src/lib/elm_check.c:411
 msgid "State"
 msgstr ""
@@ -158,7 +89,6 @@ msgid "Select"
 msgstr "Selecteren"
 
 #: src/lib/elm_entry.c:1374
->>>>>>> remotes/origin/upstream
 msgid "Paste"
 msgstr "Plakken"
 
@@ -166,13 +96,6 @@ msgstr "Plakken"
 msgid "Radio"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_searchbar.c:199
-msgid "Search"
-msgstr ""
-
-=======
->>>>>>> remotes/origin/upstream
 #: src/lib/elm_toggle.c:11
 msgid "ON"
 msgstr ""
@@ -181,30 +104,11 @@ msgstr ""
 msgid "OFF"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_toolbar.c:676
-=======
 #: src/lib/elm_toolbar.c:802
->>>>>>> remotes/origin/upstream
 #, fuzzy
 msgid "Selected"
 msgstr "Selecteren"
 
-<<<<<<< HEAD
-#: src/lib/elm_toolbar.c:757
-msgid "Separator"
-msgstr ""
-
-#: src/lib/elm_toolbar.c:761
-msgid "State: Selected"
-msgstr ""
-
-#: src/lib/elm_toolbar.c:763
-msgid "Has menu"
-msgstr ""
-
-#: src/lib/elm_toolbar.c:821
-=======
 #: src/lib/elm_toolbar.c:884
 msgid "Separator"
 msgstr ""
@@ -218,6 +122,5 @@ msgid "Has menu"
 msgstr ""
 
 #: src/lib/elm_toolbar.c:954
->>>>>>> remotes/origin/upstream
 msgid "Tool Item"
 msgstr ""
index b290460..76578cc 100644 (file)
--- a/po/ps.po
+++ b/po/ps.po
@@ -2,20 +2,12 @@
 # This file is distributed under the same license as the Elementary package.
 # FIRST AUTHOR <tom.hacohen@partner.samsung.com>, 2010.
 #
-<<<<<<< HEAD
-#: src/lib/elm_config.c:1417
-=======
 #: src/lib/elm_config.c:1943
->>>>>>> remotes/origin/upstream
 msgid ""
 msgstr ""
 "Project-Id-Version: elementary\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2012-02-05 10:59+0900\n"
-=======
 "POT-Creation-Date: 2012-03-08 01:42+0900\n"
->>>>>>> remotes/origin/upstream
 "PO-Revision-Date: 2010-12-26 10:05+0200\n"
 "Last-Translator: Tom Hacohen <tom.hacohen@partner.samsung.com>\n"
 "Language-Team: General\n"
@@ -32,20 +24,11 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elc_fileselector.c:1001 src/lib/elm_entry.c:1468
-#: src/lib/elm_searchbar.c:211
-msgid "Cancel"
-msgstr ""
-
-#: src/lib/elc_fileselector.c:1011
-=======
 #: src/lib/elc_fileselector.c:1009 src/lib/elm_entry.c:1357
 msgid "Cancel"
 msgstr ""
 
 #: src/lib/elc_fileselector.c:1019
->>>>>>> remotes/origin/upstream
 msgid "OK"
 msgstr ""
 
@@ -53,13 +36,8 @@ msgstr ""
 msgid "Clicked"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_button.c:408 src/lib/elm_check.c:392 src/lib/elm_radio.c:295
-#: src/lib/elm_toolbar.c:759
-=======
 #: src/lib/elm_button.c:408 src/lib/elm_check.c:394 src/lib/elm_radio.c:295
 #: src/lib/elm_toolbar.c:886
->>>>>>> remotes/origin/upstream
 msgid "State: Disabled"
 msgstr ""
 
@@ -71,63 +49,16 @@ msgstr ""
 msgid "%B %Y"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_check.c:309 src/lib/elm_check.c:312 src/lib/elm_check.c:403
-=======
 #: src/lib/elm_check.c:311 src/lib/elm_check.c:314 src/lib/elm_check.c:405
->>>>>>> remotes/origin/upstream
 #: src/lib/elm_radio.c:231 src/lib/elm_radio.c:297
 msgid "State: On"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_check.c:322 src/lib/elm_check.c:325 src/lib/elm_check.c:412
-=======
 #: src/lib/elm_check.c:324 src/lib/elm_check.c:327 src/lib/elm_check.c:414
->>>>>>> remotes/origin/upstream
 #: src/lib/elm_radio.c:298
 msgid "State: Off"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_check.c:399 src/lib/elm_check.c:409
-msgid "State"
-msgstr ""
-
-#: src/lib/elm_check.c:462
-msgid "Check"
-msgstr ""
-
-#: src/lib/elm_config.c:1354
-msgid "default:LTR"
-msgstr "default:RTL"
-
-#: src/lib/elm_datefield.c:412
-msgid "PM"
-msgstr ""
-
-#: src/lib/elm_datefield.c:413
-msgid "AM"
-msgstr ""
-
-#: src/lib/elm_datefield.c:740
-msgid "DateTimeFormat"
-msgstr ""
-
-#: src/lib/elm_entry.c:1462
-msgid "Copy"
-msgstr ""
-
-#: src/lib/elm_entry.c:1465
-msgid "Cut"
-msgstr ""
-
-#: src/lib/elm_entry.c:1479
-msgid "Select"
-msgstr ""
-
-#: src/lib/elm_entry.c:1485
-=======
 #: src/lib/elm_check.c:401 src/lib/elm_check.c:411
 msgid "State"
 msgstr ""
@@ -153,7 +84,6 @@ msgid "Select"
 msgstr ""
 
 #: src/lib/elm_entry.c:1374
->>>>>>> remotes/origin/upstream
 msgid "Paste"
 msgstr ""
 
@@ -161,13 +91,6 @@ msgstr ""
 msgid "Radio"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_searchbar.c:199
-msgid "Search"
-msgstr ""
-
-=======
->>>>>>> remotes/origin/upstream
 #: src/lib/elm_toggle.c:11
 msgid "ON"
 msgstr ""
@@ -176,25 +99,6 @@ msgstr ""
 msgid "OFF"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_toolbar.c:676
-msgid "Selected"
-msgstr ""
-
-#: src/lib/elm_toolbar.c:757
-msgid "Separator"
-msgstr ""
-
-#: src/lib/elm_toolbar.c:761
-msgid "State: Selected"
-msgstr ""
-
-#: src/lib/elm_toolbar.c:763
-msgid "Has menu"
-msgstr ""
-
-#: src/lib/elm_toolbar.c:821
-=======
 #: src/lib/elm_toolbar.c:802
 msgid "Selected"
 msgstr ""
@@ -212,6 +116,5 @@ msgid "Has menu"
 msgstr ""
 
 #: src/lib/elm_toolbar.c:954
->>>>>>> remotes/origin/upstream
 msgid "Tool Item"
 msgstr ""
index afef5d6..b294b45 100644 (file)
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,20 +1,12 @@
 # Portuguese translation for Elementary.
 # This file is put in the public domain.
 # Sérgio Marques <smarquespt@gmail.com>, 2011.
-<<<<<<< HEAD
-#: src/lib/elm_config.c:1417
-=======
 #: src/lib/elm_config.c:1943
->>>>>>> remotes/origin/upstream
 msgid ""
 msgstr ""
 "Project-Id-Version: Elementary\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2012-02-05 10:59+0900\n"
-=======
 "POT-Creation-Date: 2012-03-08 01:42+0900\n"
->>>>>>> remotes/origin/upstream
 "PO-Revision-Date: 2011-11-17 12:25-0000\n"
 "Last-Translator: Sérgio Marques <smarquespt@gmail.com>\n"
 "Language-Team: \n"
@@ -33,20 +25,11 @@ msgstr "Para cima"
 msgid "Home"
 msgstr "Pasta pessoal"
 
-<<<<<<< HEAD
-#: src/lib/elc_fileselector.c:1001 src/lib/elm_entry.c:1468
-#: src/lib/elm_searchbar.c:211
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: src/lib/elc_fileselector.c:1011
-=======
 #: src/lib/elc_fileselector.c:1009 src/lib/elm_entry.c:1357
 msgid "Cancel"
 msgstr "Cancelar"
 
 #: src/lib/elc_fileselector.c:1019
->>>>>>> remotes/origin/upstream
 msgid "OK"
 msgstr "OK"
 
@@ -54,13 +37,8 @@ msgstr "OK"
 msgid "Clicked"
 msgstr "Clicado"
 
-<<<<<<< HEAD
-#: src/lib/elm_button.c:408 src/lib/elm_check.c:392 src/lib/elm_radio.c:295
-#: src/lib/elm_toolbar.c:759
-=======
 #: src/lib/elm_button.c:408 src/lib/elm_check.c:394 src/lib/elm_radio.c:295
 #: src/lib/elm_toolbar.c:886
->>>>>>> remotes/origin/upstream
 msgid "State: Disabled"
 msgstr "Estado: inativo"
 
@@ -72,63 +50,16 @@ msgstr "Botão"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-<<<<<<< HEAD
-#: src/lib/elm_check.c:309 src/lib/elm_check.c:312 src/lib/elm_check.c:403
-=======
 #: src/lib/elm_check.c:311 src/lib/elm_check.c:314 src/lib/elm_check.c:405
->>>>>>> remotes/origin/upstream
 #: src/lib/elm_radio.c:231 src/lib/elm_radio.c:297
 msgid "State: On"
 msgstr "Estado: ligado"
 
-<<<<<<< HEAD
-#: src/lib/elm_check.c:322 src/lib/elm_check.c:325 src/lib/elm_check.c:412
-=======
 #: src/lib/elm_check.c:324 src/lib/elm_check.c:327 src/lib/elm_check.c:414
->>>>>>> remotes/origin/upstream
 #: src/lib/elm_radio.c:298
 msgid "State: Off"
 msgstr "Estado: desligado"
 
-<<<<<<< HEAD
-#: src/lib/elm_check.c:399 src/lib/elm_check.c:409
-msgid "State"
-msgstr "Estado"
-
-#: src/lib/elm_check.c:462
-msgid "Check"
-msgstr "Verificar"
-
-#: src/lib/elm_config.c:1354
-msgid "default:LTR"
-msgstr "omissão: LTR"
-
-#: src/lib/elm_datefield.c:412
-msgid "PM"
-msgstr ""
-
-#: src/lib/elm_datefield.c:413
-msgid "AM"
-msgstr ""
-
-#: src/lib/elm_datefield.c:740
-msgid "DateTimeFormat"
-msgstr ""
-
-#: src/lib/elm_entry.c:1462
-msgid "Copy"
-msgstr "Copiar"
-
-#: src/lib/elm_entry.c:1465
-msgid "Cut"
-msgstr "Cortar"
-
-#: src/lib/elm_entry.c:1479
-msgid "Select"
-msgstr "Selecionar"
-
-#: src/lib/elm_entry.c:1485
-=======
 #: src/lib/elm_check.c:401 src/lib/elm_check.c:411
 msgid "State"
 msgstr "Estado"
@@ -154,7 +85,6 @@ msgid "Select"
 msgstr "Selecionar"
 
 #: src/lib/elm_entry.c:1374
->>>>>>> remotes/origin/upstream
 msgid "Paste"
 msgstr "Colar"
 
@@ -162,13 +92,6 @@ msgstr "Colar"
 msgid "Radio"
 msgstr "Opção"
 
-<<<<<<< HEAD
-#: src/lib/elm_searchbar.c:199
-msgid "Search"
-msgstr ""
-
-=======
->>>>>>> remotes/origin/upstream
 #: src/lib/elm_toggle.c:11
 msgid "ON"
 msgstr "Ligar"
@@ -177,25 +100,6 @@ msgstr "Ligar"
 msgid "OFF"
 msgstr "Desligar"
 
-<<<<<<< HEAD
-#: src/lib/elm_toolbar.c:676
-msgid "Selected"
-msgstr "Selecionado"
-
-#: src/lib/elm_toolbar.c:757
-msgid "Separator"
-msgstr "Separador"
-
-#: src/lib/elm_toolbar.c:761
-msgid "State: Selected"
-msgstr "Estado: selecionado"
-
-#: src/lib/elm_toolbar.c:763
-msgid "Has menu"
-msgstr "Tem menu"
-
-#: src/lib/elm_toolbar.c:821
-=======
 #: src/lib/elm_toolbar.c:802
 msgid "Selected"
 msgstr "Selecionado"
@@ -213,6 +117,5 @@ msgid "Has menu"
 msgstr "Tem menu"
 
 #: src/lib/elm_toolbar.c:954
->>>>>>> remotes/origin/upstream
 msgid "Tool Item"
 msgstr "Ferramenta"
index b290460..76578cc 100644 (file)
--- a/po/ur.po
+++ b/po/ur.po
@@ -2,20 +2,12 @@
 # This file is distributed under the same license as the Elementary package.
 # FIRST AUTHOR <tom.hacohen@partner.samsung.com>, 2010.
 #
-<<<<<<< HEAD
-#: src/lib/elm_config.c:1417
-=======
 #: src/lib/elm_config.c:1943
->>>>>>> remotes/origin/upstream
 msgid ""
 msgstr ""
 "Project-Id-Version: elementary\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2012-02-05 10:59+0900\n"
-=======
 "POT-Creation-Date: 2012-03-08 01:42+0900\n"
->>>>>>> remotes/origin/upstream
 "PO-Revision-Date: 2010-12-26 10:05+0200\n"
 "Last-Translator: Tom Hacohen <tom.hacohen@partner.samsung.com>\n"
 "Language-Team: General\n"
@@ -32,20 +24,11 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elc_fileselector.c:1001 src/lib/elm_entry.c:1468
-#: src/lib/elm_searchbar.c:211
-msgid "Cancel"
-msgstr ""
-
-#: src/lib/elc_fileselector.c:1011
-=======
 #: src/lib/elc_fileselector.c:1009 src/lib/elm_entry.c:1357
 msgid "Cancel"
 msgstr ""
 
 #: src/lib/elc_fileselector.c:1019
->>>>>>> remotes/origin/upstream
 msgid "OK"
 msgstr ""
 
@@ -53,13 +36,8 @@ msgstr ""
 msgid "Clicked"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_button.c:408 src/lib/elm_check.c:392 src/lib/elm_radio.c:295
-#: src/lib/elm_toolbar.c:759
-=======
 #: src/lib/elm_button.c:408 src/lib/elm_check.c:394 src/lib/elm_radio.c:295
 #: src/lib/elm_toolbar.c:886
->>>>>>> remotes/origin/upstream
 msgid "State: Disabled"
 msgstr ""
 
@@ -71,63 +49,16 @@ msgstr ""
 msgid "%B %Y"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_check.c:309 src/lib/elm_check.c:312 src/lib/elm_check.c:403
-=======
 #: src/lib/elm_check.c:311 src/lib/elm_check.c:314 src/lib/elm_check.c:405
->>>>>>> remotes/origin/upstream
 #: src/lib/elm_radio.c:231 src/lib/elm_radio.c:297
 msgid "State: On"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_check.c:322 src/lib/elm_check.c:325 src/lib/elm_check.c:412
-=======
 #: src/lib/elm_check.c:324 src/lib/elm_check.c:327 src/lib/elm_check.c:414
->>>>>>> remotes/origin/upstream
 #: src/lib/elm_radio.c:298
 msgid "State: Off"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_check.c:399 src/lib/elm_check.c:409
-msgid "State"
-msgstr ""
-
-#: src/lib/elm_check.c:462
-msgid "Check"
-msgstr ""
-
-#: src/lib/elm_config.c:1354
-msgid "default:LTR"
-msgstr "default:RTL"
-
-#: src/lib/elm_datefield.c:412
-msgid "PM"
-msgstr ""
-
-#: src/lib/elm_datefield.c:413
-msgid "AM"
-msgstr ""
-
-#: src/lib/elm_datefield.c:740
-msgid "DateTimeFormat"
-msgstr ""
-
-#: src/lib/elm_entry.c:1462
-msgid "Copy"
-msgstr ""
-
-#: src/lib/elm_entry.c:1465
-msgid "Cut"
-msgstr ""
-
-#: src/lib/elm_entry.c:1479
-msgid "Select"
-msgstr ""
-
-#: src/lib/elm_entry.c:1485
-=======
 #: src/lib/elm_check.c:401 src/lib/elm_check.c:411
 msgid "State"
 msgstr ""
@@ -153,7 +84,6 @@ msgid "Select"
 msgstr ""
 
 #: src/lib/elm_entry.c:1374
->>>>>>> remotes/origin/upstream
 msgid "Paste"
 msgstr ""
 
@@ -161,13 +91,6 @@ msgstr ""
 msgid "Radio"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_searchbar.c:199
-msgid "Search"
-msgstr ""
-
-=======
->>>>>>> remotes/origin/upstream
 #: src/lib/elm_toggle.c:11
 msgid "ON"
 msgstr ""
@@ -176,25 +99,6 @@ msgstr ""
 msgid "OFF"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_toolbar.c:676
-msgid "Selected"
-msgstr ""
-
-#: src/lib/elm_toolbar.c:757
-msgid "Separator"
-msgstr ""
-
-#: src/lib/elm_toolbar.c:761
-msgid "State: Selected"
-msgstr ""
-
-#: src/lib/elm_toolbar.c:763
-msgid "Has menu"
-msgstr ""
-
-#: src/lib/elm_toolbar.c:821
-=======
 #: src/lib/elm_toolbar.c:802
 msgid "Selected"
 msgstr ""
@@ -212,6 +116,5 @@ msgid "Has menu"
 msgstr ""
 
 #: src/lib/elm_toolbar.c:954
->>>>>>> remotes/origin/upstream
 msgid "Tool Item"
 msgstr ""
index b290460..76578cc 100644 (file)
--- a/po/yi.po
+++ b/po/yi.po
@@ -2,20 +2,12 @@
 # This file is distributed under the same license as the Elementary package.
 # FIRST AUTHOR <tom.hacohen@partner.samsung.com>, 2010.
 #
-<<<<<<< HEAD
-#: src/lib/elm_config.c:1417
-=======
 #: src/lib/elm_config.c:1943
->>>>>>> remotes/origin/upstream
 msgid ""
 msgstr ""
 "Project-Id-Version: elementary\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2012-02-05 10:59+0900\n"
-=======
 "POT-Creation-Date: 2012-03-08 01:42+0900\n"
->>>>>>> remotes/origin/upstream
 "PO-Revision-Date: 2010-12-26 10:05+0200\n"
 "Last-Translator: Tom Hacohen <tom.hacohen@partner.samsung.com>\n"
 "Language-Team: General\n"
@@ -32,20 +24,11 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elc_fileselector.c:1001 src/lib/elm_entry.c:1468
-#: src/lib/elm_searchbar.c:211
-msgid "Cancel"
-msgstr ""
-
-#: src/lib/elc_fileselector.c:1011
-=======
 #: src/lib/elc_fileselector.c:1009 src/lib/elm_entry.c:1357
 msgid "Cancel"
 msgstr ""
 
 #: src/lib/elc_fileselector.c:1019
->>>>>>> remotes/origin/upstream
 msgid "OK"
 msgstr ""
 
@@ -53,13 +36,8 @@ msgstr ""
 msgid "Clicked"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_button.c:408 src/lib/elm_check.c:392 src/lib/elm_radio.c:295
-#: src/lib/elm_toolbar.c:759
-=======
 #: src/lib/elm_button.c:408 src/lib/elm_check.c:394 src/lib/elm_radio.c:295
 #: src/lib/elm_toolbar.c:886
->>>>>>> remotes/origin/upstream
 msgid "State: Disabled"
 msgstr ""
 
@@ -71,63 +49,16 @@ msgstr ""
 msgid "%B %Y"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_check.c:309 src/lib/elm_check.c:312 src/lib/elm_check.c:403
-=======
 #: src/lib/elm_check.c:311 src/lib/elm_check.c:314 src/lib/elm_check.c:405
->>>>>>> remotes/origin/upstream
 #: src/lib/elm_radio.c:231 src/lib/elm_radio.c:297
 msgid "State: On"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_check.c:322 src/lib/elm_check.c:325 src/lib/elm_check.c:412
-=======
 #: src/lib/elm_check.c:324 src/lib/elm_check.c:327 src/lib/elm_check.c:414
->>>>>>> remotes/origin/upstream
 #: src/lib/elm_radio.c:298
 msgid "State: Off"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_check.c:399 src/lib/elm_check.c:409
-msgid "State"
-msgstr ""
-
-#: src/lib/elm_check.c:462
-msgid "Check"
-msgstr ""
-
-#: src/lib/elm_config.c:1354
-msgid "default:LTR"
-msgstr "default:RTL"
-
-#: src/lib/elm_datefield.c:412
-msgid "PM"
-msgstr ""
-
-#: src/lib/elm_datefield.c:413
-msgid "AM"
-msgstr ""
-
-#: src/lib/elm_datefield.c:740
-msgid "DateTimeFormat"
-msgstr ""
-
-#: src/lib/elm_entry.c:1462
-msgid "Copy"
-msgstr ""
-
-#: src/lib/elm_entry.c:1465
-msgid "Cut"
-msgstr ""
-
-#: src/lib/elm_entry.c:1479
-msgid "Select"
-msgstr ""
-
-#: src/lib/elm_entry.c:1485
-=======
 #: src/lib/elm_check.c:401 src/lib/elm_check.c:411
 msgid "State"
 msgstr ""
@@ -153,7 +84,6 @@ msgid "Select"
 msgstr ""
 
 #: src/lib/elm_entry.c:1374
->>>>>>> remotes/origin/upstream
 msgid "Paste"
 msgstr ""
 
@@ -161,13 +91,6 @@ msgstr ""
 msgid "Radio"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_searchbar.c:199
-msgid "Search"
-msgstr ""
-
-=======
->>>>>>> remotes/origin/upstream
 #: src/lib/elm_toggle.c:11
 msgid "ON"
 msgstr ""
@@ -176,25 +99,6 @@ msgstr ""
 msgid "OFF"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/lib/elm_toolbar.c:676
-msgid "Selected"
-msgstr ""
-
-#: src/lib/elm_toolbar.c:757
-msgid "Separator"
-msgstr ""
-
-#: src/lib/elm_toolbar.c:761
-msgid "State: Selected"
-msgstr ""
-
-#: src/lib/elm_toolbar.c:763
-msgid "Has menu"
-msgstr ""
-
-#: src/lib/elm_toolbar.c:821
-=======
 #: src/lib/elm_toolbar.c:802
 msgid "Selected"
 msgstr ""
@@ -212,6 +116,5 @@ msgid "Has menu"
 msgstr ""
 
 #: src/lib/elm_toolbar.c:954
->>>>>>> remotes/origin/upstream
 msgid "Tool Item"
 msgstr ""
diff --git a/src/lib/elm_cnp_helper.c b/src/lib/elm_cnp_helper.c
deleted file mode 100644 (file)
index 5b8c996..0000000
+++ /dev/null
@@ -1,1920 +0,0 @@
-#ifdef HAVE_CONFIG_H
-# include "elementary_config.h"
-#endif
-#include <Elementary.h>
-#include "elm_priv.h"
-
-#ifdef HAVE_MMAN_H
-# include <sys/mman.h>
-#endif
-
-#ifdef HAVE_ELEMENTARY_X
-
-#define ARRAYINIT(foo)  [foo] =
-
-//#define DEBUGON 1
-
-#ifdef DEBUGON
-# define cnp_debug(x...) fprintf(stderr, __FILE__": " x)
-#else
-# define cnp_debug(x...)
-#endif
-
-#define PROVIDER_SET "__elm_cnp_provider_set"
-
-typedef struct _Paste_Image   Paste_Image;
-typedef struct _Cnp_Selection Cnp_Selection;
-typedef struct _Escape        Escape;
-typedef struct _Tmp_Info      Tmp_Info;
-typedef struct _Cnp_Atom      Cnp_Atom;
-typedef struct _Saved_Type    Saved_Type;
-typedef struct _Dropable      Dropable;
-
-typedef Eina_Bool (*Converter_Fn_Cb)     (char *target, void *data, int size, void **data_ret, int *size_ret, Ecore_X_Atom *ttype, int *typesize);
-typedef int       (*Response_Handler_Cb) (Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *);
-typedef int       (*Notify_Handler_Cb)   (Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *);
-
-enum
-{
-   CNP_ATOM_TARGETS = 0,
-   CNP_ATOM_ATOM,
-   CNP_ATOM_LISTING_ATOMS = CNP_ATOM_ATOM,
-   CNP_ATOM_text_uri,
-   CNP_ATOM_text_urilist,
-   CNP_ATOM_text_x_vcard,
-   CNP_ATOM_image_png,
-   CNP_ATOM_image_jpeg,
-   CNP_ATOM_image_bmp,
-   CNP_ATOM_image_gif,
-   CNP_ATOM_image_tiff,
-   CNP_ATOM_image_svg,
-   CNP_ATOM_image_xpm,
-   CNP_ATOM_image_tga,
-   CNP_ATOM_image_ppm,
-   CNP_ATOM_XELM,
-   CNP_ATOM_text_html_utf8,
-   CNP_ATOM_text_html,
-   CNP_ATOM_UTF8STRING,
-   CNP_ATOM_STRING,
-   CNP_ATOM_TEXT,
-   CNP_ATOM_text_plain_utf8,
-   CNP_ATOM_text_plain,
-
-   CNP_N_ATOMS,
-};
-
-struct _Paste_Image
-{
-   Evas_Object *entry;
-   const char  *tag;
-   const char  *file;
-   Evas_Object *img;
-};
-
-struct _Cnp_Selection
-{
-   const char          *debug;
-   Evas_Object         *widget;
-   char                *selbuf;
-   Evas_Object         *requestwidget;
-   void                *udata;
-   Elm_Sel_Format  requestformat;
-   Elm_Drop_Cb          datacb;
-   Eina_Bool      (*set)     (Ecore_X_Window, const void *data, int size);
-   Eina_Bool      (*clear)   (void);
-   void           (*request) (Ecore_X_Window, const char *target);
-
-   Elm_Sel_Format  format;
-   Ecore_X_Selection    ecore_sel;
-
-   Eina_Bool         active : 1;
-};
-
-struct _Escape
-{
-   const char *escape;
-   const char *value;
-};
-
-struct _Tmp_Info
-{
-   char *filename;
-   void *map;
-   int   fd;
-   int   len;
-};
-
-struct _Cnp_Atom
-{
-   const char          *name;
-   Elm_Sel_Format  formats;
-   /* Called by ecore to do conversion */
-   Converter_Fn_Cb      converter;
-   Response_Handler_Cb  response;
-   Notify_Handler_Cb    notify;
-   /* Atom */
-   Ecore_X_Atom         atom;
-};
-
-struct _Saved_Type
-{
-   const char  **types;
-   Paste_Image  *pi;
-   int           ntypes;
-   int           x, y;
-   Eina_Bool     textreq: 1;
-};
-
-struct _Dropable
-{
-   Evas_Object         *obj;
-   /* FIXME: Cache window */
-   Elm_Sel_Format  types;
-   Elm_Drop_Cb          dropcb;
-   void                *cbdata;
-};
-
-static Tmp_Info *elm_cnp_tempfile_create(int size);
-static int tmpinfo_free(Tmp_Info *tmp);
-
-static Eina_Bool _elm_cnp_init(void);
-static Eina_Bool selection_clear(void *udata __UNUSED__, int type, void *event);
-static Eina_Bool selection_notify(void *udata __UNUSED__, int type, void *event);
-
-static Evas_Object *image_provider(void *images, Evas_Object *entry, const char *item);
-static void entry_deleted(void *images, Evas *e, Evas_Object *entry, void *unused);
-
-static Eina_Bool targets_converter(char *target, void *data, int size, void **data_ret, int *size_ret, Ecore_X_Atom *ttype, int *typesize);
-static Eina_Bool text_converter(char *target, void *data, int size, void **data_ret, int *size_ret, Ecore_X_Atom *ttype, int *typesize);
-static Eina_Bool general_converter(char *target, void *data, int size, void **data_ret, int *size_ret, Ecore_X_Atom *ttype, int *typesize);
-static Eina_Bool image_converter(char *target, void *data, int size, void **data_ret, int *size_ret, Ecore_X_Atom *ttype, int *typesize);
-static Eina_Bool vcard_send(char *target, void *data, int size, void **data_ret, int *size_ret, Ecore_X_Atom *ttype, int *typesize);
-
-static int response_handler_targets(Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *);
-
-static int notify_handler_targets(Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *notify);
-static int notify_handler_text(Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *notify);
-static int notify_handler_image(Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *notify);
-static int notify_handler_uri(Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *notify);
-static int notify_handler_edje(Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *notify);
-static int notify_handler_html(Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *notify);
-static int vcard_receive(Cnp_Selection *sed, Ecore_X_Event_Selection_Notify *notify);
-
-static Paste_Image *pasteimage_alloc(const char *file, int pathlen);
-static Eina_Bool pasteimage_append(Paste_Image *pi, Evas_Object *entry);
-static void pasteimage_free(Paste_Image *pi);
-static void entry_insert_filter(Evas_Object* entry, char* str);
-
-
-static Cnp_Atom atoms[CNP_N_ATOMS] = {
-     [CNP_ATOM_TARGETS] = {
-          "TARGETS",
-          ELM_SEL_FORMAT_TARGETS,
-          targets_converter,
-          response_handler_targets,
-          notify_handler_targets,
-          0
-     },
-     [CNP_ATOM_ATOM] = {
-          "ATOM", // for opera browser
-          ELM_SEL_FORMAT_TARGETS,
-          targets_converter,
-          response_handler_targets,
-          notify_handler_targets,
-          0
-     },
-     [CNP_ATOM_ATOM] = {
-          "ATOM",
-          (Elm_Sel_Format) -1, // everything
-          targets_converter,
-          response_handler_targets,
-          notify_handler_targets,
-          0
-     },
-     [CNP_ATOM_XELM] =  {
-          "application/x-elementary-markup",
-          ELM_SEL_FORMAT_MARKUP,
-          general_converter,
-          NULL,
-          notify_handler_edje,
-          0
-     },
-     [CNP_ATOM_text_uri] = {
-          "text/uri",
-          ELM_SEL_FORMAT_IMAGE, /* Either images or entries */
-          general_converter,
-          NULL,
-          notify_handler_uri,
-          0
-     },
-     [CNP_ATOM_text_urilist] = {
-          "text/uri-list",
-          ELM_SEL_FORMAT_IMAGE,
-          general_converter,
-          NULL,
-          notify_handler_uri,
-          0
-     },
-     [CNP_ATOM_text_x_vcard] = {
-          "text/x-vcard",
-          ELM_SEL_FORMAT_VCARD,
-          vcard_send, NULL,
-          vcard_receive, 0
-     },
-     [CNP_ATOM_image_png] = {
-          "image/png",
-          ELM_SEL_FORMAT_IMAGE,
-          image_converter,
-          NULL,
-          notify_handler_image,
-          0
-     },
-     [CNP_ATOM_image_jpeg] = {
-          "image/jpeg",
-          ELM_SEL_FORMAT_IMAGE,
-          image_converter,
-          NULL,
-          notify_handler_image,/* Raw image data is the same */
-          0
-     },
-     [CNP_ATOM_image_bmp] = {
-          "image/x-ms-bmp",
-          ELM_SEL_FORMAT_IMAGE,
-          image_converter,
-          NULL,
-          notify_handler_image,/* Raw image data is the same */
-          0
-     },
-     [CNP_ATOM_image_gif] = {
-          "image/gif",
-          ELM_SEL_FORMAT_IMAGE,
-          image_converter,
-          NULL,
-          notify_handler_image,/* Raw image data is the same */
-          0
-     },
-     [CNP_ATOM_image_tiff] = {
-          "image/tiff",
-          ELM_SEL_FORMAT_IMAGE,
-          image_converter,
-          NULL,
-          notify_handler_image,/* Raw image data is the same */
-          0
-     },
-     [CNP_ATOM_image_svg] = {
-          "image/svg+xml",
-          ELM_SEL_FORMAT_IMAGE,
-          image_converter,
-          NULL,
-          notify_handler_image,/* Raw image data is the same */
-          0
-     },
-     [CNP_ATOM_image_xpm] = {
-          "image/x-xpixmap",
-          ELM_SEL_FORMAT_IMAGE,
-          image_converter,
-          NULL,
-          notify_handler_image,/* Raw image data is the same */
-          0
-     },
-     [CNP_ATOM_image_tga] = {
-          "image/x-tga",
-          ELM_SEL_FORMAT_IMAGE,
-          image_converter,
-          NULL,
-          notify_handler_image,/* Raw image data is the same */
-          0
-     },
-     [CNP_ATOM_image_ppm] = {
-          "image/x-portable-pixmap",
-          ELM_SEL_FORMAT_IMAGE,
-          image_converter,
-          NULL,
-          notify_handler_image,/* Raw image data is the same */
-          0
-     },
-     [CNP_ATOM_text_html_utf8] = {
-          "text/html;charset=utf-8",
-          ELM_SEL_FORMAT_HTML,
-          general_converter,
-          NULL,
-          notify_handler_html,
-          0
-     },
-     [CNP_ATOM_text_html] = {
-          "text/html",
-          ELM_SEL_FORMAT_HTML,
-          general_converter,
-          NULL,
-          notify_handler_html, /* No encoding: Webkit only */
-          0
-     },
-     [CNP_ATOM_UTF8STRING] = {
-          "UTF8_STRING",
-          ELM_SEL_FORMAT_TEXT | ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_HTML,
-          text_converter,
-          NULL,
-          notify_handler_text,
-          0
-     },
-     [CNP_ATOM_STRING] = {
-          "STRING",
-          ELM_SEL_FORMAT_TEXT | ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_HTML,
-          text_converter,
-          NULL,
-          notify_handler_text,
-          0
-     },
-     [CNP_ATOM_TEXT] = {
-          "TEXT",
-          ELM_SEL_FORMAT_TEXT | ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_HTML,
-          text_converter,
-          NULL,
-          NULL,
-          0
-     },
-     [CNP_ATOM_text_plain_utf8] = {
-          "text/plain;charset=utf-8",
-          ELM_SEL_FORMAT_TEXT | ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_HTML,
-          text_converter,
-          NULL,
-          NULL,
-          0
-     },
-     [CNP_ATOM_text_plain] = {
-          "text/plain",
-          ELM_SEL_FORMAT_TEXT | ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_HTML,
-          text_converter,
-          NULL,
-          NULL,
-          0
-     },
-};
-
-static Cnp_Selection selections[ELM_SEL_TYPE_MAX] = {
-     ARRAYINIT(ELM_SEL_TYPE_PRIMARY) {
-          .debug = "Primary",
-          .ecore_sel = ECORE_X_SELECTION_PRIMARY,
-          .set = ecore_x_selection_primary_set,
-          .clear = ecore_x_selection_primary_clear,
-          .request = ecore_x_selection_primary_request,
-     },
-     ARRAYINIT(ELM_SEL_TYPE_SECONDARY) {
-          .debug = "Secondary",
-          .ecore_sel = ECORE_X_SELECTION_SECONDARY,
-          .set = ecore_x_selection_secondary_set,
-          .clear = ecore_x_selection_secondary_clear,
-          .request = ecore_x_selection_secondary_request,
-     },
-     ARRAYINIT(ELM_SEL_TYPE_CLIPBOARD) {
-          .debug = "Clipboard",
-          .ecore_sel = ECORE_X_SELECTION_CLIPBOARD,
-          .set = ecore_x_selection_clipboard_set,
-          .clear = ecore_x_selection_clipboard_clear,
-          .request = ecore_x_selection_clipboard_request,
-     },
-     ARRAYINIT(ELM_SEL_TYPE_XDND) {
-          .debug = "XDnD",
-          .ecore_sel = ECORE_X_SELECTION_XDND,
-          .request = ecore_x_selection_xdnd_request,
-     },
-};
-
-/* Data for DND in progress */
-static Saved_Type savedtypes =  { NULL, NULL, 0, 0, 0, EINA_FALSE };
-
-static void (*dragdonecb) (void *data, Evas_Object *obj) = NULL;
-static void *dragdonedata = NULL;
-
-static int _elm_cnp_init_count = 0;
-
-static Eina_List *pastedimages = NULL;
-
-/**
- * Drag & Drop functions
- */
-
-/* FIXME: Way too many globals */
-static Eina_List *drops = NULL;
-static Evas_Object *dragwin = NULL;
-static int _dragx = 0, _dragy = 0;
-static Ecore_Event_Handler *handler_pos = NULL;
-static Ecore_Event_Handler *handler_drop = NULL;
-static Ecore_Event_Handler *handler_enter = NULL;
-static Ecore_Event_Handler *handler_status = NULL;
-
-#endif
-
-/* Stringshared, so I can just compare pointers later */
-static const char *text_uri;
-
-Eina_Bool
-elm_selection_selection_has_owner(void)
-{
-#ifdef HAVE_ELEMENTARY_X
-   return !!ecore_x_selection_owner_get(ECORE_X_ATOM_SELECTION_CLIPBOARD);
-#else
-   return EINA_FALSE;
-#endif
-}
-
-Eina_Bool
-elm_cnp_selection_set(Elm_Sel_Type selection, Evas_Object *widget,
-                      Elm_Sel_Format format, const void *selbuf, size_t buflen)
-{
-#ifdef HAVE_ELEMENTARY_X
-   Evas_Object *top = elm_widget_top_get(widget);
-   Ecore_X_Window xwin;
-   Cnp_Selection *sel;
-
-   if (top) xwin = elm_win_xwindow_get(top);
-   else xwin = elm_win_xwindow_get(widget);
-   if ((!xwin) || (selection >= ELM_SEL_TYPE_MAX))
-     return EINA_FALSE;
-   if (!_elm_cnp_init_count) _elm_cnp_init();
-   if ((!selbuf) && (format != ELM_SEL_FORMAT_IMAGE))
-     return elm_cnp_selection_clear(selection, widget);
-
-   sel = selections + selection;
-
-   sel->active = EINA_TRUE;
-   sel->widget = widget;
-   sel->set(xwin, &selection, sizeof(Elm_Sel_Type));
-   sel->format = format;
-
-   if (selbuf)
-     {
-        if (format == ELM_SEL_FORMAT_IMAGE)
-          {
-             sel->selbuf = malloc(buflen+1);
-             memcpy(sel->selbuf, selbuf, buflen);
-          }
-        else
-          sel->selbuf = strdup((char*)selbuf);
-     }
-   else
-     sel->selbuf = NULL;
-
-   return EINA_TRUE;
-#else
-   return EINA_FALSE;
-#endif
-}
-
-Eina_Bool
-elm_cnp_selection_clear(Elm_Sel_Type selection, Evas_Object *widget)
-{
-#ifdef HAVE_ELEMENTARY_X
-   Cnp_Selection *sel;
-
-   if ((unsigned int)selection >= (unsigned int)ELM_SEL_TYPE_MAX)
-     return EINA_FALSE;
-   if (!_elm_cnp_init_count) _elm_cnp_init();
-
-   sel = selections + selection;
-
-   /* No longer this selection: Consider it gone! */
-   if ((!sel->active) || (sel->widget != widget)) return EINA_TRUE;
-
-   sel->active = EINA_FALSE;
-   sel->widget = NULL;
-   if (sel->selbuf)
-     {
-        free(sel->selbuf);
-        sel->selbuf = NULL;
-     }
-   sel->clear();
-
-   return EINA_TRUE;
-#else
-   return EINA_FALSE;
-#endif
-}
-
-Eina_Bool
-elm_cnp_selection_get(Elm_Sel_Type selection, Elm_Sel_Format format,
-                      Evas_Object *widget, Elm_Drop_Cb datacb, void *udata)
-{
-#ifdef HAVE_ELEMENTARY_X
-   Evas_Object *top;
-   Cnp_Selection *sel;
-
-   if (selection >= ELM_SEL_TYPE_MAX)
-     return EINA_FALSE;
-   if (!_elm_cnp_init_count) _elm_cnp_init();
-
-   sel = selections + selection;
-   top = elm_widget_top_get(widget);
-   if (!top) return EINA_FALSE;
-
-   sel->requestformat = format;
-   sel->requestwidget = widget;
-   sel->request(elm_win_xwindow_get(top), ECORE_X_SELECTION_TARGET_TARGETS);
-   sel->datacb = datacb;
-   sel->udata = udata;
-
-   return EINA_TRUE;
-#else
-   return EINA_FALSE;
-#endif
-}
-
-#ifdef HAVE_ELEMENTARY_X
-
-static Eina_Bool
-_elm_cnp_init(void)
-{
-   int i;
-
-   if (_elm_cnp_init_count++) return EINA_TRUE;
-   for (i = 0; i < CNP_N_ATOMS; i++)
-     {
-        atoms[i].atom = ecore_x_atom_get(atoms[i].name);
-        ecore_x_selection_converter_atom_add(atoms[i].atom,
-                                             atoms[i].converter);
-     }
-   ecore_event_handler_add(ECORE_X_EVENT_SELECTION_CLEAR, selection_clear, NULL);
-   ecore_event_handler_add(ECORE_X_EVENT_SELECTION_NOTIFY, selection_notify, NULL);
-
-   text_uri = eina_stringshare_add("text/uri-list");
-   return EINA_TRUE;
-}
-
-static Eina_Bool
-selection_clear(void *udata __UNUSED__, int type __UNUSED__, void *event)
-{
-   Ecore_X_Event_Selection_Clear *ev = event;
-   Cnp_Selection *sel;
-   int i;
-
-   for (i = 0; i < ELM_SEL_TYPE_MAX; i++)
-     {
-        if (selections[i].ecore_sel == ev->selection) break;
-     }
-   cnp_debug("selection %d clear\n", i);
-   /* Not me... Don't care */
-   if (i == ELM_SEL_TYPE_MAX) return ECORE_CALLBACK_PASS_ON;
-
-   sel = selections + i;
-   sel->active = EINA_FALSE;
-   sel->widget = NULL;
-   if (sel->selbuf)
-     {
-        free(sel->selbuf);
-        sel->selbuf = NULL;
-     }
-
-   return ECORE_CALLBACK_PASS_ON;
-}
-
-
-/*
- * Response to a selection notify:
- *     - So we have asked for the selection list.
- *     - If it's the targets list, parse it, and fire of what we want,
- *     else it's the data we want.
- */
-static Eina_Bool
-selection_notify(void *udata __UNUSED__, int type __UNUSED__, void *event)
-{
-   Ecore_X_Event_Selection_Notify *ev = event;
-   Cnp_Selection *sel;
-   int i;
-
-   cnp_debug("selection notify callback: %d\n",ev->selection);
-   switch (ev->selection)
-     {
-      case ECORE_X_SELECTION_CLIPBOARD:
-         sel = selections + ELM_SEL_TYPE_CLIPBOARD;
-         break;
-      case ECORE_X_SELECTION_PRIMARY:
-         sel = selections + ELM_SEL_TYPE_PRIMARY;
-         break;
-      case ECORE_X_SELECTION_SECONDARY:
-         sel = selections + ELM_SEL_TYPE_SECONDARY;
-         break;
-      case ECORE_X_SELECTION_XDND:
-         sel = selections + ELM_SEL_TYPE_XDND;
-         break;
-      default:
-         return ECORE_CALLBACK_PASS_ON;
-     }
-   cnp_debug("Target is %s\n", ev->target);
-
-   for (i = 0; i < CNP_N_ATOMS; i++)
-     {
-        if (!strcmp(ev->target, atoms[i].name))
-          {
-             if (atoms[i].notify)
-               {
-                  cnp_debug("Found something: %s\n", atoms[i].name);
-                  atoms[i].notify(sel, ev);
-               }
-             else
-               {
-                  cnp_debug("Ignored: No handler!\n");
-               }
-          }
-     }
-
-   return ECORE_CALLBACK_PASS_ON;
-}
-
-static Elm_Sel_Format
-_get_selection_type(void *data, int size)
-{
-   if (size == sizeof(Elm_Sel_Type))
-     {
-        Cnp_Selection *sel = selections + *((int *)data);
-        if (sel->active &&
-            (sel->format >= ELM_SEL_FORMAT_TARGETS) &&
-            (sel->format < ELM_SEL_FORMAT_MAX))
-          return sel->format;
-     }
-   return ELM_SEL_FORMAT_NONE;
-}
-
-static Eina_Bool
-targets_converter(char *target __UNUSED__, void *data, int size, void **data_ret, int *size_ret, Ecore_X_Atom *ttype, int *typesize)
-{
-   int i,count;
-   Ecore_X_Atom *aret;
-   Cnp_Selection *sel;
-   Elm_Sel_Format seltype;
-
-   if (!data_ret) return EINA_FALSE;
-
-   if (!data || (*((unsigned int *)data) >= ELM_SEL_TYPE_MAX))
-     return EINA_FALSE;
-
-   if (_get_selection_type(data, size) == ELM_SEL_FORMAT_NONE)
-     {
-        /* TODO : fallback into precise type */
-        seltype = ELM_SEL_FORMAT_TEXT;
-     }
-   else
-     {
-        sel = selections + *((int *)data);
-        seltype = sel->format;
-     }
-
-   for (i = 0, count = 0; i < CNP_N_ATOMS ; i++)
-     {
-        if (seltype & atoms[i].formats) count++;
-     }
-
-   aret = malloc(sizeof(Ecore_X_Atom) * count);
-   for (i = 0, count = 0; i < CNP_N_ATOMS; i++)
-     {
-        if (seltype & atoms[i].formats) aret[count ++] = atoms[i].atom;
-     }
-
-   *data_ret = aret;
-   if (typesize) *typesize = 32 /* urk */;
-   if (ttype) *ttype = ECORE_X_ATOM_ATOM;
-   if (size_ret) *size_ret = count;
-
-   return EINA_TRUE;
-}
-
-static Eina_Bool
-image_converter(char *target __UNUSED__, void *data __UNUSED__, int size __UNUSED__, void **data_ret __UNUSED__, int *size_ret __UNUSED__, Ecore_X_Atom *ttype __UNUSED__, int *typesize __UNUSED__)
-{
-   cnp_debug("Image converter called\n");
-   return EINA_TRUE;
-}
-
-static Eina_Bool
-vcard_send(char *target __UNUSED__, void *data __UNUSED__, int size __UNUSED__, void **data_ret, int *size_ret, Ecore_X_Atom *ttype __UNUSED__, int *typesize __UNUSED__)
-{
-   Cnp_Selection *sel;
-
-   cnp_debug("Vcard send called\n");
-
-   if (!data || (*((unsigned int *)data) >= ELM_SEL_TYPE_MAX))
-     return EINA_FALSE;
-   sel = selections + *((int *)data);
-
-   if (data_ret) *data_ret = strdup(sel->selbuf);
-   if (size_ret) *size_ret = strlen(sel->selbuf);
-
-   return EINA_TRUE;
-}
-
-#if 0
-static Eina_Bool
-is_uri_type_data(Cnp_Selection *sel __UNUSED__, Ecore_X_Event_Selection_Notify *notify)
-{
-   Ecore_X_Selection_Data *data;
-   char *p;
-
-   data = notify->data;
-   cnp_debug("data->format is %d %p %p\n", data->format, notify, data);
-   if (data->content == ECORE_X_SELECTION_CONTENT_FILES) return EINA_TRUE;
-   p = (char *)data->data;
-   if (!p) return EINA_TRUE;
-
-   cnp_debug("Got %s\n", p);
-   if (strncmp(p, "file://", 7))
-     {
-        if (*p != '/') return EINA_FALSE;
-     }
-
-   return EINA_TRUE;
-}
-#endif
-/*
- * Callback to handle a targets response on a selection request:
- * So pick the format we'd like; and then request it.
- */
-static int
-notify_handler_targets(Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *notify)
-{
-   Ecore_X_Selection_Data_Targets *targets;
-   Ecore_X_Atom *atomlist;
-   Evas_Object *top;
-   int i, j;
-
-   targets = notify->data;
-   atomlist = (Ecore_X_Atom *)(targets->data.data);
-
-   for (j = (CNP_ATOM_LISTING_ATOMS+1); j < CNP_N_ATOMS; j++)
-     {
-        cnp_debug("\t%s %d\n", atoms[j].name, atoms[j].atom);
-        if (!(atoms[j].formats & sel->requestformat)) continue;
-        for (i = 0; i < targets->data.length; i++)
-          {
-             if ((atoms[j].atom == atomlist[i]) && (atoms[j].notify))
-               {
-#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;
-               }
-          }
-     }
-
-   cnp_debug("Couldn't find anything that matches\n");
-   return ECORE_CALLBACK_PASS_ON;
-
-done:
-   top = elm_widget_top_get(sel->requestwidget);
-   if (!top) top = sel->requestwidget;
-   cnp_debug("Sending request for %s\n", atoms[j].name);
-   sel->request(elm_win_xwindow_get(top), atoms[j].name);
-
-   return ECORE_CALLBACK_PASS_ON;
-}
-
-static int
-response_handler_targets(Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *notify)
-{
-   Ecore_X_Selection_Data_Targets *targets;
-   Ecore_X_Atom *atomlist;
-   Evas_Object *top;
-   int i,j;
-
-   targets = notify->data;
-   atomlist = (Ecore_X_Atom *)(targets->data.data);
-
-   for (j = (CNP_ATOM_LISTING_ATOMS+1); j < CNP_N_ATOMS; j++)
-     {
-        if (!(atoms[j].formats & sel->requestformat)) continue;
-        for (i = 0 ; i < targets->data.length ; i ++)
-          {
-             if ((atoms[j].atom == atomlist[i]) && (atoms[j].response))
-               {
-                  /* Found a match: Use it */
-                  goto found;
-               }
-          }
-     }
-   cnp_debug("No matching type found\n");
-   return 0;
-
-found:
-   top = elm_widget_top_get(sel->requestwidget);
-   if (!top) return 0;
-
-   sel->request(elm_win_xwindow_get(top), atoms[j].name);
-   return 0;
-}
-
-static void
-entry_insert_filter(Evas_Object* entry, char* str)
-{
-   if (!entry || !str)
-     return;
-
-   char *insertStr = str;
-   // if entry has text only set then remove item tags
-   if (elm_entry_cnp_mode_get(entry) != ELM_CNP_MODE_MARKUP)
-     {
-        while (EINA_TRUE)
-          {
-             char *startTag = NULL;
-             char *endTag = NULL;
-
-             startTag = strstr(insertStr, "<item");
-             if (!startTag)
-               startTag = strstr(insertStr, "</item");
-             if (startTag)
-               endTag = strstr(startTag, ">");
-             else
-               break;
-             if (!endTag || startTag > endTag)
-               {
-                  cnp_debug("Broken tag: %s\n", str);
-                  break;
-               }
-
-             size_t sindex = startTag - insertStr;
-             size_t eindex = endTag - insertStr + 1;
-
-             Eina_Strbuf *buf = eina_strbuf_new();
-             if (buf)
-               {
-                  eina_strbuf_append(buf, insertStr);
-                  eina_strbuf_remove(buf, sindex, eindex);
-                  insertStr = eina_strbuf_string_steal(buf);
-                  eina_strbuf_free(buf);
-               }
-          }
-     }
-   cnp_debug("remove item tag: %s\n", insertStr);
-
-   // if entry has single line set then remove <br> & <ps> tags
-   if (elm_entry_single_line_get(entry))
-     {
-        Eina_Strbuf *buf = eina_strbuf_new();
-        if (buf)
-          {
-             eina_strbuf_append(buf, insertStr);
-             eina_strbuf_replace_all(buf, "<br>", "");
-             eina_strbuf_replace_all(buf, "<ps>", "");
-             insertStr = eina_strbuf_string_steal(buf);
-             eina_strbuf_free(buf);
-          }
-     }
-   cnp_debug("remove break tag: %s\n", insertStr);
-
-   _elm_entry_entry_paste(entry, insertStr);
-
-   if (insertStr != str)
-     free(insertStr);
-}
-
-static int
-notify_handler_text(Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *notify)
-{
-   Ecore_X_Selection_Data *data;
-   char *str;
-
-   data = notify->data;
-
-   if (sel->datacb)
-     {
-        Elm_Selection_Data ddata;
-        str = malloc(sizeof(char) * (data->length + 1));
-        strncpy(str, (char *)data->data, data->length);
-        str[data->length] = '\0';
-
-        ddata.x = ddata.y = 0;
-        ddata.format = ELM_SEL_FORMAT_TEXT;
-        ddata.data = str;
-        ddata.len = data->length;
-        sel->datacb(sel->udata, sel->widget, &ddata);
-        free(str);
-        return 0;
-     }
-
-   cnp_debug("Notify handler text %d %d %p\n", data->format,data->length, data->data);
-   str = _elm_util_text_to_mkup((const char *) data->data);
-   cnp_debug("String is %s (from %s)\n", str, data->data);
-   entry_insert_filter(sel->requestwidget, str);
-   //_elm_entry_entry_paste(sel->requestwidget, str);
-   free(str);
-   return 0;
-}
-
-
-/**
- * So someone is pasting an image into my entry or widget...
- */
-static int
-notify_handler_uri(Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *notify)
-{
-   Ecore_X_Selection_Data *data;
-   Ecore_X_Selection_Data_Files *files;
-   Paste_Image *pi;
-   char *p, *stripstr;
-
-   data = notify->data;
-   cnp_debug("data->format is %d %p %p\n", data->format, notify, data);
-   if (data->content == ECORE_X_SELECTION_CONTENT_FILES)
-     {
-        cnp_debug("got a files list\n");
-        files = notify->data;
-        if (files->num_files > 1)
-          {
-             /* Don't handle many items */
-             cnp_debug("more then one file: Bailing\n");
-             return 0;
-          }
-        stripstr = p = strdup(files->files[0]);
-     }
-   else
-     {
-        stripstr = p = malloc(data->length * sizeof(char) + 1);
-        memcpy(stripstr, data->data, data->length);
-        stripstr[data->length] = 0;
-     }
-
-   if (!p)
-     {
-        cnp_debug("Couldn't find a file\n");
-        return 0;
-     }
-   cnp_debug("Got %s\n",p);
-   if (sel->datacb)
-     {
-        Elm_Selection_Data ddata;
-
-        ddata.x = ddata.y = 0;
-        ddata.format = ELM_SEL_FORMAT_IMAGE;
-        ddata.data = p;
-        ddata.len = data->length;
-        sel->datacb(sel->udata, sel->widget, &ddata);
-        free(p);
-        return 0;
-     }
-   if (strncmp(p, "file://", 7))
-     {
-        /* Try and continue if it looks sane */
-        if (*p != '/')
-          {
-             free(p);
-             return 0;
-          }
-     }
-   else
-     {
-        p += strlen("file://");
-     }
-
-   if (savedtypes.pi) pasteimage_free(savedtypes.pi);
-   pi = pasteimage_alloc(p, strlen(p));
-   if (savedtypes.textreq)
-     {
-        savedtypes.textreq = 0;
-        savedtypes.pi = pi;
-     }
-   else
-     {
-        pasteimage_append(pi, sel->requestwidget);
-        savedtypes.pi = NULL;
-     }
-   free(stripstr);
-   return 0;
-}
-
-/**
- * Just receieved an vcard, either through cut and paste, or dnd.
- */
-static int
-vcard_receive(Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *notify)
-{
-   Dropable *dropable;
-   Eina_List *l;
-   Ecore_X_Selection_Data *data;
-
-   data = notify->data;
-   cnp_debug("vcard receive\n");
-
-   if (sel == (selections + ELM_SEL_TYPE_XDND))
-     {
-        Elm_Selection_Data ddata;
-
-        cnp_debug("drag & drop\n");
-        /* FIXME: this needs to be generic: Used for all receives */
-        EINA_LIST_FOREACH(drops, l, dropable)
-          {
-             if (dropable->obj == sel->requestwidget) break;
-          }
-        if (!dropable)
-          {
-             cnp_debug("Unable to find drop object");
-             ecore_x_dnd_send_finished();
-             return 0;
-          }
-        dropable = eina_list_data_get(l);
-        ddata.x = savedtypes.x;
-        ddata.y = savedtypes.y;
-        ddata.format = ELM_SEL_FORMAT_VCARD;
-        ddata.data = data->data;
-        ddata.len = data->length;
-        dropable->dropcb(dropable->cbdata, dropable->obj, &ddata);
-        ecore_x_dnd_send_finished();
-     }
-   else if (sel->datacb)
-     {
-        Elm_Selection_Data ddata;
-        ddata.x = ddata.y = 0;
-        ddata.format = ELM_SEL_FORMAT_IMAGE;
-        ddata.data = data->data;
-        ddata.len = data->length;
-        sel->datacb(sel->udata, sel->widget, &ddata);
-     }
-   else
-     {
-        cnp_debug("Paste request\n");
-     }
-
-   return 0;
-
-}
-
-static int
-notify_handler_image(Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *notify)
-{
-   Ecore_X_Selection_Data *data;
-   Tmp_Info *tmp;
-   Paste_Image *pi;
-
-   cnp_debug("got a image file!\n");
-   data = notify->data;
-
-   cnp_debug("Size if %d\n", data->length);
-
-   if (sel->datacb)
-     {
-        Elm_Selection_Data ddata;
-
-        ddata.x = ddata.y = 0;
-        ddata.format = ELM_SEL_FORMAT_IMAGE;
-        ddata.data = data->data;
-        ddata.len = data->length;
-        sel->datacb(sel->udata, sel->widget, &ddata);
-        return 0;
-     }
-
-   /* generate tmp name */
-   tmp = elm_cnp_tempfile_create(data->length);
-   memcpy(tmp->map, data->data, data->length);
-   munmap(tmp->map, data->length);
-
-   /* FIXME: Add to paste image data to clean up */
-   pi = pasteimage_alloc(tmp->filename, strlen(tmp->filename));
-   pasteimage_append(pi, sel->requestwidget);
-
-   tmpinfo_free(tmp);
-   return 0;
-}
-
-static int
-notify_handler_edje(Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *notify)
-{
-   Ecore_X_Selection_Data *data;
-
-   data = notify->data;
-
-   char *stripstr = NULL;
-   stripstr = malloc(sizeof(char) * (data->length + 1));
-   strncpy(stripstr, (char *)data->data, data->length);
-   stripstr[data->length] = '\0';
-
-   if (sel->datacb)
-     {
-        Elm_Selection_Data ddata;
-        ddata.x = ddata.y = 0;
-        ddata.format = ELM_SEL_FORMAT_MARKUP;
-        ddata.data = stripstr;
-        ddata.len = data->length;
-        sel->datacb(sel->udata, sel->widget, &ddata);
-     }
-   else
-     entry_insert_filter(sel->requestwidget, stripstr);
-     //_elm_entry_entry_paste(sel->requestwidget, stripstr);
-
-   cnp_debug("String is %s (%d bytes)\n", stripstr, data->length);
-   free(stripstr);
-   return 0;
-}
-
-/**
- *    Warning: Generic text/html can';t handle it sanely.
- *    Firefox sends ucs2 (i think).
- *       chrome sends utf8... blerg
- */
-static int
-notify_handler_html(Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *notify)
-{
-   Ecore_X_Selection_Data *data;
-
-   cnp_debug("Got some HTML: Checking encoding is useful\n");
-   data = notify->data;
-
-   char *stripstr = NULL;
-   stripstr = malloc(sizeof(char) * (data->length + 1));
-   strncpy(stripstr, (char *)data->data, data->length);
-   stripstr[data->length] = '\0';
-
-   if (sel->datacb)
-     {
-        Elm_Selection_Data ddata;
-        ddata.x = ddata.y = 0;
-        ddata.format = ELM_SEL_FORMAT_HTML;
-        ddata.data = stripstr;
-        ddata.len = data->length;
-        sel->datacb(sel->udata, sel->widget, &ddata);
-     }
-   else
-     entry_insert_filter(sel->requestwidget, stripstr);
-   //_elm_entry_entry_paste(sel->requestwidget, stripstr);
-
-   cnp_debug("String is %s (%d bytes)\n", stripstr, data->length);
-   free(stripstr);
-   return 0;
-}
-
-
-static Eina_Bool
-text_converter(char *target __UNUSED__, void *data, int size, void **data_ret, int *size_ret, Ecore_X_Atom *ttype __UNUSED__, int *typesize __UNUSED__)
-{
-   Cnp_Selection *sel;
-
-   cnp_debug("text converter\n");
-   if (!data || (*((unsigned int *)data) >= ELM_SEL_TYPE_MAX))
-     return EINA_FALSE;
-   if (_get_selection_type(data, size) == ELM_SEL_FORMAT_NONE)
-     {
-        if (data_ret)
-          {
-             *data_ret = malloc(size * sizeof(char) + 1);
-             memcpy(*data_ret, data, size);
-             ((char**)(data_ret))[0][size] = 0;
-          }
-        if (size_ret) *size_ret = size;
-        return EINA_TRUE;
-     }
-   sel = selections + *((int *)data);
-   if (!sel->active) return EINA_TRUE;
-
-   if (sel->format & ELM_SEL_FORMAT_MARKUP)
-     *data_ret = _elm_util_mkup_to_text(sel->selbuf);
-   else if (sel->format & ELM_SEL_FORMAT_HTML)
-     {
-        char *text = NULL;
-        Eina_Strbuf *buf = eina_strbuf_new();
-        if (buf)
-          {
-             eina_strbuf_append(buf, sel->selbuf);
-             eina_strbuf_replace_all(buf, "&nbsp;", " ");
-             text = eina_strbuf_string_steal(buf);
-             eina_strbuf_free(buf);
-             *data_ret = _elm_util_mkup_to_text(text);
-             free(text);
-          }
-        else
-          *data_ret = _elm_util_mkup_to_text(sel->selbuf);
-     }
-   else if (sel->format & ELM_SEL_FORMAT_TEXT)
-     {
-        *data_ret = strdup(sel->selbuf);
-        *size_ret = strlen(sel->selbuf);
-     }
-   else if (sel->format & ELM_SEL_FORMAT_IMAGE)
-     {
-        cnp_debug("Image %s\n", evas_object_type_get(sel->widget));
-        cnp_debug("Elm type: %s\n", elm_object_widget_type_get(sel->widget));
-        evas_object_image_file_get(elm_photocam_internal_image_get(sel->widget),
-                                   (const char **)data_ret, NULL);
-        if (!*data_ret) *data_ret = strdup("No file");
-        else *data_ret = strdup(*data_ret);
-        *size_ret = strlen(*data_ret);
-     }
-   return EINA_TRUE;
-}
-
-static Eina_Bool
-general_converter(char *target __UNUSED__, void *data, int size, void **data_ret, int *size_ret, Ecore_X_Atom *ttype __UNUSED__, int *typesize __UNUSED__)
-{
-   if (_get_selection_type(data, size) == ELM_SEL_FORMAT_NONE)
-     {
-        if (data_ret)
-          {
-             *data_ret = malloc(size * sizeof(char) + 1);
-             memcpy(*data_ret, data, size);
-             ((char**)(data_ret))[0][size] = 0;
-          }
-        if (size_ret) *size_ret = size;
-     }
-   else
-     {
-        Cnp_Selection *sel;
-        if (!data || (*((unsigned int *)data) >= ELM_SEL_TYPE_MAX))
-          return EINA_FALSE;
-
-        sel = selections + *((int *)data);
-        if (data_ret) *data_ret = strdup(sel->selbuf);
-        if (size_ret) *size_ret = strlen(sel->selbuf);
-     }
-   return EINA_TRUE;
-}
-
-/*
- * Image paste provide
- */
-
-/* FIXME: Should add provider for each pasted item: Use data to store it
- * much easier */
-static Evas_Object *
-image_provider(void *images __UNUSED__, Evas_Object *entry, const char *item)
-{
-   Paste_Image *pi;
-   Eina_List *l;
-
-   cnp_debug("image provider for %s called\n", item);
-   EINA_LIST_FOREACH(pastedimages, l, pi)
-     {
-        cnp_debug("is it %s?\n",pi->tag);
-        if (!strcmp(pi->tag, item))
-          {
-             /* Found it */
-             Evas_Object *o;
-             o = evas_object_image_filled_add(evas_object_evas_get(entry));
-             /* FIXME: Handle eets */
-             cnp_debug("file is %s (object is %p)\n", pi->file, o);
-             evas_object_image_file_set(o, pi->file, NULL);
-             evas_object_show(o);
-             return o;
-          }
-     }
-   return NULL;
-}
-
-
-static Paste_Image *
-pasteimage_alloc(const char *file, int pathlen)
-{
-   Paste_Image *pi;
-   int len;
-   char *buf, *filebuf;
-   int prefixlen = strlen("file://");
-
-   pi = calloc(1, sizeof(Paste_Image));
-   if (!pi) return NULL;
-
-   len = snprintf(NULL, 0, "pasteimage-%p", pi);
-   len++;
-   buf = malloc(len);
-   if (!buf)
-     {
-        free(pi);
-        return NULL;
-     }
-   snprintf(buf, len, "pasteimage-%p", pi);
-   pi->tag = buf;
-
-   if (file)
-     {
-        if (strstr(file,"file://")) file += prefixlen;
-        filebuf = alloca(pathlen + 1);
-        strncpy(filebuf, file, pathlen);
-        filebuf[pathlen] = 0;
-        pi->file = strdup(filebuf);
-     }
-
-   return pi;
-}
-
-static void
-pasteimage_free(Paste_Image *pi)
-{
-   if (!pi) return;
-   if (pi->file) free((void*)pi->file);
-   if (pi->tag) free((void*)pi->tag);
-   free(pi);
-}
-
-static Eina_Bool
-pasteimage_provider_set(Evas_Object *entry)
-{
-   void *v;
-   const char *type;
-
-   if (!entry) return EINA_FALSE;
-   type = elm_widget_type_get(entry);
-   cnp_debug("type is %s\n", type);
-   if ((!type) || (strcmp(type, "entry"))) return EINA_FALSE;
-
-   v = evas_object_data_get(entry, PROVIDER_SET);
-   if (!v)
-     {
-        evas_object_data_set(entry, PROVIDER_SET, pasteimage_provider_set);
-        elm_entry_item_provider_append(entry, image_provider, NULL);
-        evas_object_event_callback_add(entry, EVAS_CALLBACK_FREE,
-                                       entry_deleted, NULL);
-     }
-   return EINA_TRUE;
-}
-
-
-static Eina_Bool
-pasteimage_append(Paste_Image *pi, Evas_Object *entry)
-{
-   char *entrytag;
-   int len;
-   static const char *tagstring = "<item absize=240x180 href=file://%s></item>";
-
-   if (!pi) return EINA_FALSE;
-   if (!entry) return EINA_FALSE;
-   if (elm_entry_cnp_mode_get(entry) != ELM_CNP_MODE_MARKUP) return EINA_FALSE;
-
-   pasteimage_provider_set(entry);
-
-   len = strlen(tagstring)+strlen(pi->file);
-
-   pastedimages = eina_list_append(pastedimages, pi);
-   entrytag = alloca(len + 1);
-   snprintf(entrytag, len + 1, tagstring, pi->file);
-   elm_entry_entry_insert(entry, entrytag);
-   //_elm_entry_entry_paste(entry, entrytag);
-
-   return EINA_TRUE;
-}
-
-static void
-entry_deleted(void *images __UNUSED__, Evas *e __UNUSED__, Evas_Object *entry, void *unused __UNUSED__)
-{
-   Paste_Image *pi;
-   Eina_List *l,*next;
-
-   EINA_LIST_FOREACH_SAFE(pastedimages, l, next, pi)
-     {
-        if (pi->entry == entry)
-          pastedimages = eina_list_remove_list(pastedimages, l);
-     }
-}
-
-static Eina_Bool
-_dnd_enter(void *data __UNUSED__, int etype __UNUSED__, void *ev)
-{
-   Ecore_X_Event_Xdnd_Enter *enter = ev;
-   int i;
-
-   /* Skip it */
-   if ((!enter) || (!enter->num_types) || (!enter->types)) return EINA_TRUE;
-
-   cnp_debug("Types\n");
-   savedtypes.ntypes = enter->num_types;
-   if (savedtypes.types) free(savedtypes.types);
-   savedtypes.types = malloc(sizeof(char *) * enter->num_types);
-   if (!savedtypes.types) return EINA_FALSE;
-
-   for (i = 0; i < enter->num_types; i++)
-     {
-        savedtypes.types[i] = eina_stringshare_add(enter->types[i]);
-        cnp_debug("Type is %s %p %p\n", enter->types[i],
-                  savedtypes.types[i],text_uri);
-        if (savedtypes.types[i] == text_uri)
-          {
-             /* Request it, so we know what it is */
-             cnp_debug("Sending uri request\n");
-             savedtypes.textreq = 1;
-             if (savedtypes.pi) pasteimage_free(savedtypes.pi);
-             savedtypes.pi = NULL;
-             ecore_x_selection_xdnd_request(enter->win, text_uri);
-          }
-     }
-
-   /* FIXME: Find an object and make it current */
-   return EINA_TRUE;
-}
-
-static Eina_Bool
-_dnd_drop(void *data __UNUSED__, int etype __UNUSED__, void *ev)
-{
-   struct _Ecore_X_Event_Xdnd_Drop *drop;
-   Dropable *dropable;
-   Eina_List *l;
-   Ecore_Evas *ee;
-   Ecore_X_Window xwin;
-   Elm_Selection_Data ddata;
-   int x, y, w, h;
-   int i, j;
-
-   drop = ev;
-
-   // check we still have something to drop
-   if (!drops) return EINA_TRUE;
-
-   /* Find any widget in our window; then work out geometry rel to our window */
-   for (l = drops; l; l = l->next)
-     {
-        dropable = l->data;
-        xwin = (Ecore_X_Window)ecore_evas_window_get
-           (ecore_evas_ecore_evas_get(evas_object_evas_get
-                                      (dropable->obj)));
-        if (xwin == drop->win) break;
-     }
-   /* didn't find a window */
-   if (!l) return EINA_TRUE;
-
-   /* Calculate real (widget relative) position */
-   // - window position
-   // - widget position
-   ee = ecore_evas_ecore_evas_get(evas_object_evas_get(dropable->obj));
-   ecore_evas_geometry_get(ee, &x, &y, NULL, NULL);
-   savedtypes.x = drop->position.x - x;
-   savedtypes.y = drop->position.y - y;
-
-   cnp_debug("Drop position is %d,%d\n", savedtypes.x, savedtypes.y);
-
-   for (; l; l = l->next)
-     {
-        dropable = l->data;
-        evas_object_geometry_get(dropable->obj, &x, &y, &w, &h);
-        if ((savedtypes.x >= x) && (savedtypes.y >= y) &&
-            (savedtypes.x < x + w) && (savedtypes.y < y + h))
-          break; /* found! */
-     }
-
-   if (!l) return EINA_TRUE; /* didn't find one */
-
-   evas_object_geometry_get(dropable->obj, &x, &y, NULL, NULL);
-   savedtypes.x -= x;
-   savedtypes.y -= y;
-
-   /* Find our type from the previous list */
-   for (i = 0; i < CNP_N_ATOMS; i++)
-     {
-        for (j = 0; j < savedtypes.ntypes; j++)
-          {
-             if (!strcmp(savedtypes.types[j], atoms[i].name)) goto found;
-          }
-     }
-
-   cnp_debug("Didn't find a target\n");
-   return EINA_TRUE;
-
-found:
-   cnp_debug("Found a target we'd like: %s\n", atoms[i].name);
-   cnp_debug("0x%x\n",xwin);
-
-   if (i == CNP_ATOM_text_urilist)
-     {
-        cnp_debug("We found a URI... (%scached) %s\n",
-                  savedtypes.pi ? "" : "not ",
-                  savedtypes.pi->file);
-        if (savedtypes.pi)
-          {
-             char *entrytag;
-             static const char *tagstring = "<item absize=240x180 href="
-                "file://%s></item>";
-             ddata.x = savedtypes.x;
-             ddata.y = savedtypes.y;
-
-             /* If it's markup that also supports images */
-             if ((dropable->types & ELM_SEL_FORMAT_MARKUP) &&
-                 (dropable->types & ELM_SEL_FORMAT_IMAGE))
-               {
-                  int len;
-                  ddata.format = ELM_SEL_FORMAT_MARKUP;
-                  pasteimage_provider_set(dropable->obj);
-
-                  pastedimages = eina_list_append(pastedimages, savedtypes.pi);
-                  len = strlen(tagstring) + strlen(savedtypes.pi->file);
-                  entrytag = alloca(len + 1);
-                  snprintf(entrytag, len + 1, tagstring, savedtypes.pi->file);
-                  ddata.data = entrytag;
-                  cnp_debug("Insert %s\n", (char *)ddata.data);
-                  dropable->dropcb(dropable->cbdata, dropable->obj, &ddata);
-                  ecore_x_dnd_send_finished();
-
-                  if (savedtypes.pi) pasteimage_free(savedtypes.pi);
-                  savedtypes.pi = NULL;
-                  return EINA_TRUE;
-               }
-             else if (dropable->types & ELM_SEL_FORMAT_IMAGE)
-               {
-                  cnp_debug("Doing image insert (%s)\n", savedtypes.pi->file);
-                  ddata.format = ELM_SEL_FORMAT_IMAGE;
-                  ddata.data = (char *)savedtypes.pi->file;
-                  dropable->dropcb(dropable->cbdata, dropable->obj, &ddata);
-                  ecore_x_dnd_send_finished();
-
-                  if (savedtypes.pi) pasteimage_free(savedtypes.pi);
-                  savedtypes.pi = NULL;
-
-                  return EINA_TRUE;
-               }
-             else
-               {
-                  cnp_debug("Item doesn't support images... passing\n");
-                  pasteimage_free(savedtypes.pi);
-                  return EINA_TRUE;
-               }
-          }
-        else if (savedtypes.textreq)
-          {
-             /* Already asked: Pretend we asked now, and paste immediately when
-              * it comes in */
-             savedtypes.textreq = 0;
-             ecore_x_dnd_send_finished();
-             return EINA_TRUE;
-          }
-     }
-
-   cnp_debug("doing a request then\n");
-   selections[ELM_SEL_TYPE_XDND].requestwidget = dropable->obj;
-   selections[ELM_SEL_TYPE_XDND].requestformat = ELM_SEL_FORMAT_MARKUP;
-   selections[ELM_SEL_TYPE_XDND].active = EINA_TRUE;
-
-   ecore_x_selection_xdnd_request(xwin, atoms[i].name);
-
-   return EINA_TRUE;
-}
-static Eina_Bool
-_dnd_position(void *data __UNUSED__, int etype __UNUSED__, void *ev)
-{
-   struct _Ecore_X_Event_Xdnd_Position *pos;
-   Ecore_X_Rectangle rect;
-
-   pos = ev;
-
-   /* Need to send a status back */
-   /* FIXME: Should check I can drop here */
-   /* FIXME: Should highlight widget */
-   rect.x = pos->position.x - 5;
-   rect.y = pos->position.y - 5;
-   rect.width = 10;
-   rect.height = 10;
-   ecore_x_dnd_send_status(EINA_TRUE, EINA_FALSE, rect, pos->action);
-
-   return EINA_TRUE;
-}
-
-/**
- * When dragging this is callback response from the destination.
- * The important thing we care about: Can we drop; thus update cursor
- * appropriately.
- */
-static Eina_Bool
-_dnd_status(void *data __UNUSED__, int etype __UNUSED__, void *ev)
-{
-   struct _Ecore_X_Event_Xdnd_Status *status = ev;
-
-   if (!status) return EINA_TRUE;
-
-   /* Only thing we care about: will accept */
-   if (status->will_accept)
-     {
-        cnp_debug("Will accept\n");
-     }
-   else
-     { /* Won't accept */
-        cnp_debug("Won't accept accept\n");
-     }
-   return EINA_TRUE;
-}
-
-/**
- * Add a widget as drop target.
- */
-Eina_Bool
-elm_drop_target_add(Evas_Object *obj, Elm_Sel_Type format, Elm_Drop_Cb dropcb, void *cbdata)
-{
-   Dropable *drop;
-   Ecore_X_Window xwin;
-   Eina_List *item;
-   int first;
-   Evas_Object *top;
-
-   if (!obj) return EINA_FALSE;
-   top = elm_widget_top_get(obj);
-   if (!top || !elm_win_xwindow_get(top)) return EINA_FALSE;
-   if (!_elm_cnp_init_count) _elm_cnp_init();
-
-   /* Is this the first? */
-   first = (!drops) ? 1 : 0;
-
-   EINA_LIST_FOREACH(drops, item, drop)
-     {
-        if (drop->obj == obj)
-          {
-             /* Update: Not a new one */
-             drop->dropcb = dropcb;
-             drop->cbdata = cbdata;
-             drop->types = format;
-             return EINA_TRUE;
-          }
-     }
-
-   /* Create new drop */
-   drop = calloc(1, sizeof(Dropable));
-   if (!drop) return EINA_FALSE;
-   /* FIXME: Check for eina's deranged error method */
-   drops = eina_list_append(drops, drop);
-
-   if (!drops/* || or other error */)
-     {
-        free(drop);
-        return EINA_FALSE;
-     }
-   drop->dropcb = dropcb;
-   drop->cbdata = cbdata;
-   drop->types = format;
-   drop->obj = obj;
-
-   evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL,
-                                  /* I love C and varargs */
-                                  (Evas_Object_Event_Cb)elm_drop_target_del,
-                                  obj);
-   /* FIXME: Handle resizes */
-
-   /* If not the first: We're done */
-   if (!first) return EINA_TRUE;
-
-   xwin = (Ecore_X_Window)ecore_evas_window_get
-      (ecore_evas_ecore_evas_get(evas_object_evas_get(obj)));
-
-   ecore_x_dnd_aware_set(xwin, EINA_TRUE);
-
-   cnp_debug("Adding drop target calls\n");
-   handler_enter = ecore_event_handler_add(ECORE_X_EVENT_XDND_ENTER,
-                                           _dnd_enter, NULL);
-   handler_pos = ecore_event_handler_add(ECORE_X_EVENT_XDND_POSITION,
-                                         _dnd_position, NULL);
-   handler_drop = ecore_event_handler_add(ECORE_X_EVENT_XDND_DROP,
-                                          _dnd_drop, NULL);
-
-   return EINA_TRUE;
-}
-
-Eina_Bool
-elm_drop_target_del(Evas_Object *obj)
-{
-   Dropable *drop,*del;
-   Eina_List *item;
-   Ecore_X_Window xwin;
-
-   del = NULL;
-   EINA_LIST_FOREACH(drops, item, drop)
-     {
-        if (drop->obj == obj)
-          {
-             drops = eina_list_remove_list(drops, item);
-             del = drop;
-             break;
-          }
-     }
-   if (!del) return EINA_FALSE;
-
-   evas_object_event_callback_del(obj, EVAS_CALLBACK_FREE,
-                                  (Evas_Object_Event_Cb)elm_drop_target_del);
-   free(drop);
-   /* If still drops there: All fine.. continue */
-   if (drops) return EINA_TRUE;
-
-   cnp_debug("Disabling DND\n");
-   xwin = (Ecore_X_Window)ecore_evas_window_get
-      (ecore_evas_ecore_evas_get(evas_object_evas_get(obj)));
-   ecore_x_dnd_aware_set(xwin, EINA_FALSE);
-
-   ecore_event_handler_del(handler_pos);
-   ecore_event_handler_del(handler_drop);
-   ecore_event_handler_del(handler_enter);
-
-   if (savedtypes.pi)
-     {
-        pasteimage_free(savedtypes.pi);
-        savedtypes.pi = NULL;
-     }
-
-   return EINA_TRUE;
-}
-
-
-static void
-_drag_mouse_up(void *un __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *data)
-{
-   Ecore_X_Window xwin = *((Ecore_X_Window *)data);
-   evas_object_event_callback_del(obj, EVAS_CALLBACK_MOUSE_UP, _drag_mouse_up);
-   ecore_x_dnd_drop();
-   ecore_x_dnd_aware_set(xwin, EINA_FALSE);
-   if (dragdonecb)
-     {
-        dragdonecb(dragdonedata, selections[ELM_SEL_TYPE_XDND].widget);
-        dragdonecb = NULL;
-     }
-   if (dragwin)
-     {
-        evas_object_del(dragwin);
-        dragwin = NULL;
-     }
-}
-
-static void
-_drag_move(void *data __UNUSED__, Ecore_X_Xdnd_Position *pos)
-{
-   evas_object_move(dragwin,
-                    pos->position.x - _dragx,
-                    pos->position.y - _dragy);
-}
-
-
-Eina_Bool
-elm_drag_start(Evas_Object *obj, Elm_Sel_Format format, const char *data, void (*dragdone) (void *data, Evas_Object *), void *donecbdata)
-{
-   Ecore_X_Window xwin;
-   Cnp_Selection *sel;
-   Elm_Sel_Type xdnd = ELM_SEL_TYPE_XDND;
-   Ecore_Evas *ee;
-   int x, y, x2, y2, x3, y3;
-   Evas_Object *icon;
-   int w, h;
-
-   if (!_elm_cnp_init_count) _elm_cnp_init();
-
-   xwin = elm_win_xwindow_get(obj);
-
-   cnp_debug("starting drag...\n");
-
-   if (dragwin)
-     {
-        cnp_debug("another obj is dragging...\n");
-        return EINA_FALSE;
-     }
-
-   ecore_x_dnd_type_set(xwin, "text/uri-list", EINA_TRUE);
-   sel = selections + ELM_SEL_TYPE_XDND;
-   sel->active = EINA_TRUE;
-   sel->widget = obj;
-   sel->format = format;
-   sel->selbuf = data ? strdup(data) : NULL;
-   dragdonecb = dragdone;
-   dragdonedata = donecbdata;
-
-   ecore_x_dnd_aware_set(xwin, EINA_TRUE);
-   ecore_x_dnd_callback_pos_update_set(_drag_move, NULL);
-   ecore_x_dnd_begin(xwin, (unsigned char *)&xdnd, sizeof(Elm_Sel_Type));
-   evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_UP,
-                                  _drag_mouse_up, (uintptr_t *)xwin);
-
-   handler_status = ecore_event_handler_add(ECORE_X_EVENT_XDND_STATUS,
-                                            _dnd_status, NULL);
-
-   dragwin = elm_win_add(NULL, "Elm Drag Object", ELM_WIN_UTILITY);
-   elm_win_override_set(dragwin, EINA_TRUE);
-
-   /* FIXME: Images only */
-   icon = elm_icon_add(dragwin);
-   elm_icon_file_set(icon, data + 7, NULL); /* 7!? "file://" */
-   elm_win_resize_object_add(dragwin, icon);
-   evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, EVAS_HINT_FILL);
-
-   /* Position subwindow appropriately */
-   ee = ecore_evas_ecore_evas_get(evas_object_evas_get(obj));
-   ecore_evas_geometry_get(ee, &x, &y, NULL, NULL);
-   evas_object_geometry_get(obj, &x2, &y2, &w, &h);
-   x += x2;
-   y += y2;
-   evas_object_move(dragwin, x, y);
-   evas_object_resize(icon, w, h);
-   evas_object_resize(dragwin, w, h);
-
-   evas_object_show(icon);
-   evas_object_show(dragwin);
-
-   evas_pointer_canvas_xy_get(evas_object_evas_get(obj), &x3, &y3);
-   _dragx = x3 - x2;
-   _dragy = y3 - y2;
-
-   return EINA_TRUE;
-}
-
-static Tmp_Info *
-elm_cnp_tempfile_create(int size)
-{
-#ifdef HAVE_MMAN_H
-   Tmp_Info *info;
-   const char *tmppath;
-   int len;
-
-   info = malloc(sizeof(Tmp_Info));
-   if (!info) return NULL;
-
-   tmppath = getenv("TMP");
-   if (!tmppath) tmppath = P_tmpdir;
-   len = snprintf(NULL, 0, "%s/%sXXXXXX", tmppath, "elmcnpitem-");
-   if (len < 0)
-     {
-        free(info);
-        return NULL;
-     }
-   len++;
-   info->filename = malloc(len);
-   if (!info->filename)
-     {
-        free(info);
-        return NULL;
-     }
-   snprintf(info->filename,len,"%s/%sXXXXXX", tmppath, "elmcnpitem-");
-
-   info->fd = mkstemp(info->filename);
-
-# ifdef __linux__
-     {
-        char *tmp;
-        /* And before someone says anything see POSIX 1003.1-2008 page 400 */
-        long pid;
-
-        pid = (long)getpid();
-        /* Use pid instead of /proc/self: That way if can be passed around */
-        len = snprintf(NULL,0,"/proc/%li/fd/%i", pid, info->fd);
-        len++;
-        tmp = malloc(len);
-        if (tmp)
-          {
-             snprintf(tmp,len, "/proc/%li/fd/%i", pid, info->fd);
-             unlink(info->filename);
-             free(info->filename);
-             info->filename = tmp;
-          }
-     }
-# endif
-
-   cnp_debug("filename is %s\n", info->filename);
-   if (size < 1)
-     {
-        /* Set map to NULL and return */
-        info->map = NULL;
-        info->len = 0;
-        return info;
-     }
-
-   /* Map it in */
-   if (ftruncate(info->fd, size))
-     {
-        perror("ftruncate");
-        info->map = NULL;
-        info->len = 0;
-        return info;
-     }
-
-   eina_mmap_safety_enabled_set(EINA_TRUE);
-
-   info->map = mmap(NULL, size, PROT_READ|PROT_WRITE, MAP_SHARED, info->fd, 0);
-   if (info->map == MAP_FAILED)
-     {
-        perror("mmap");
-        info->map = NULL;
-        info->len = 0;
-     }
-
-   return info;
-#else
-   (void) size;
-   return NULL;
-#endif
-}
-
-
-static int
-tmpinfo_free(Tmp_Info *info)
-{
-   if (!info) return 0;
-   free(info->filename);
-   free(info);
-   return 0;
-}
-
-#else
-/* Stubs for windows */
-Eina_Bool
-elm_drag_start(Evas_Object *o, Elm_Sel_Format f, const char *d, void (*donecb)(void *, Evas_Object *),void *cbdata)
-{
-   return EINA_FALSE;
-}
-
-Eina_Bool
-elm_drop_target_add(Evas_Object *obj, Elm_Sel_Type format, Elm_Drop_Cb dropcb, void *cbdata)
-{
-   return EINA_FALSE;
-}
-
-Eina_Bool
-elm_drop_target_del(Evas_Object *o)
-{
-   return EINA_TRUE;
-}
-#endif
-
-/* vim:set ts=8 sw=3 sts=3 expandtab cino=>5n-2f0^-2{2(0W1st0 :*/
diff --git a/src/lib/elm_colorpalette.c b/src/lib/elm_colorpalette.c
deleted file mode 100644 (file)
index 2248f44..0000000
+++ /dev/null
@@ -1,313 +0,0 @@
-#include <Elementary.h>
-#include "elm_priv.h"
-#include <Ecore.h>
-
-#define MAX_NUM_COLORS 30
-
-typedef struct _Colorpalette_Item Colorpalette_Item;
-typedef struct _Widget_Data Widget_Data;
-
-struct _Colorpalette_Item
-{
-   Evas_Object *obj;
-   Evas_Object *lo;
-   Evas_Object *cr;
-   unsigned int r, g, b;
-};
-
-struct _Widget_Data
-{
-   Evas_Object *base;
-   Evas_Object *tab;
-   Elm_Colorpalette_Color *color;
-   Eina_List *items;
-   unsigned int row, col;
-   unsigned int num;
-};
-
-static const char *widtype = NULL;
-static void _del_hook(Evas_Object *obj);
-static void _theme_hook(Evas_Object *obj);
-static void _sizing_eval(Evas_Object *obj);
-static void _colorpalette_object_resize(void *data, Evas *e, Evas_Object *obj, void *event_info);
-static void _color_select_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
-static void _color_release_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
-static void _color_table_delete(Evas_Object *obj);
-static void _color_table_update(Evas_Object *obj, unsigned int row, unsigned int col, unsigned int color_num, Elm_Colorpalette_Color *color);
-
-static void
-_del_hook(Evas_Object *obj)
-{
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return;
-   _color_table_delete(obj);
-   if (wd->color)
-     {
-        free(wd->color);
-     }
-   free(wd);
-}
-
-static void
-_theme_hook(Evas_Object *obj)
-{
-   Widget_Data *wd = elm_widget_data_get(obj);
-   _elm_theme_object_set(obj, wd->base, "colorpalette", "base", elm_widget_style_get(obj));
-   _color_table_update(obj, wd->row, wd->col, wd->num, wd->color);
-   _sizing_eval(obj);
-}
-
-static void
-_sizing_eval(Evas_Object *obj)
-{
-   Widget_Data *wd = NULL;
-   Colorpalette_Item *item = NULL;
-   Evas_Coord tab_w = 0, tab_h = 0;
-   Evas_Coord pad_x = 0, pad_y = 0;
-   Evas_Coord rect_w = 0, rect_h = 0;
-   Evas_Coord minw = -1, minh = -1;
-
-   wd = elm_widget_data_get((Evas_Object *)obj);
-   elm_coords_finger_size_adjust(1, &minw, 1, &minh);
-   edje_object_size_min_restricted_calc(wd->base, &minw, &minh, minw, minh);
-   evas_object_size_hint_min_set(obj, minw, minh);
-   evas_object_size_hint_max_set(obj, -1, -1);
-
-   edje_object_part_geometry_get(wd->base,"bg" ,NULL, NULL, &tab_w, &tab_h);
-   if (wd->items)
-     item = wd->items->data;
-   edje_object_part_geometry_get(elm_layout_edje_get(item->lo),"bg" ,NULL, NULL, &rect_w, &rect_h);
-   if (wd->col - 1) /*value cannot be 0 else divide by zero error will cause floating point exception*/
-     pad_x = (tab_w - (rect_w * wd->col)) / (wd->col - 1);
-   if (wd->row - 1) /*value cannot be 0 else divide by zero error will cause floating point exception*/
-     pad_y = (tab_h - (rect_h * wd->row)) / (wd->row - 1);
-   elm_table_padding_set(wd->tab, pad_x, pad_y);
-   elm_table_homogeneous_set(wd->tab, EINA_TRUE);
-}
-
-static void _colorpalette_object_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
-   _sizing_eval(data);
-}
-
-static void _color_select_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
-   Colorpalette_Item *item = (Colorpalette_Item *) data;
-   edje_object_signal_emit(elm_layout_edje_get(item->lo), "focus_visible", "elm");
-}
-
-static void _color_release_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
-   Elm_Colorpalette_Color *color;
-   Colorpalette_Item *item = (Colorpalette_Item *) data;
-   color = ELM_NEW(Elm_Colorpalette_Color);
-   if (!color) return;
-   color->r = item->r;
-   color->g = item->g;
-   color->b = item->b;
-   edje_object_signal_emit(elm_layout_edje_get(item->lo), "focus_invisible", "elm");
-   evas_object_smart_callback_call(item->obj, "clicked", color);
-}
-
-static void _color_table_delete(Evas_Object *obj)
-{
-   Widget_Data *wd = NULL;
-   Colorpalette_Item *item;
-   wd = elm_widget_data_get(obj);
-
-   if (wd->items)
-     {
-        EINA_LIST_FREE(wd->items, item)
-          {
-             if (item->lo)
-               {
-                  evas_object_del(item->lo);
-                  item->lo = NULL;
-               }
-             if (item->cr)
-               {
-                  evas_object_del(item->cr);
-                  item->cr = NULL;
-               }
-             free(item);
-          }
-     }
-   if (wd->tab) evas_object_del(wd->tab);
-}
-
-static void _color_table_update(Evas_Object *obj, unsigned int row, unsigned int col, unsigned int color_num, Elm_Colorpalette_Color *color)
-{
-   Widget_Data *wd = elm_widget_data_get(obj);
-   Colorpalette_Item *item;
-   Evas_Object *lo;
-   Evas_Object *cr;
-   unsigned int i, j, count;
-
-   _color_table_delete(obj);
-   count = 0;
-   wd->row = row;
-   wd->col = col;
-   wd->num = color_num;
-
-   wd->tab = elm_table_add(obj);
-   evas_object_size_hint_weight_set(wd->tab, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   evas_object_size_hint_align_set(wd->tab, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   edje_object_part_swallow(wd->base, "palette", wd->tab);
-
-   for ( i = 0 ; i < row ; i++)
-     {
-        for ( j = 0 ; j < col ; j++ )
-          {
-             item = ELM_NEW(Colorpalette_Item);
-             if (item)
-               {
-                  lo = elm_layout_add(obj);
-                  elm_layout_theme_set(lo, "colorpalette", "base", "bg");
-                  evas_object_size_hint_weight_set(lo, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-                  evas_object_size_hint_align_set(lo, EVAS_HINT_FILL, EVAS_HINT_FILL);
-                  evas_object_show(lo);
-                  elm_table_pack(wd->tab, lo, (int)j, (int)i, 1, 1);
-                  item->obj = obj;
-                  item->lo = lo;
-                  if (count < color_num)
-                    {
-                       cr =  edje_object_add(evas_object_evas_get(obj));
-                       _elm_theme_object_set(obj, cr, "colorpalette", "base", "color");
-                       evas_object_color_set(cr, color[count].r, color[count].g, color[count].b, 255);
-                       evas_object_size_hint_weight_set(cr, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-                       evas_object_size_hint_align_set(cr, EVAS_HINT_FILL, EVAS_HINT_FILL);
-                       evas_object_event_callback_add(cr, EVAS_CALLBACK_MOUSE_DOWN, _color_select_cb, item);
-                       evas_object_event_callback_add(cr, EVAS_CALLBACK_MOUSE_UP, _color_release_cb, item);
-                       evas_object_show(cr);
-                       edje_object_part_swallow(elm_layout_edje_get(lo), "color_rect", cr);
-                       item->cr = cr;
-                       item->r = color[count].r;
-                       item->g = color[count].g;
-                       item->b = color[count].b;
-                    }
-                  wd->items = eina_list_append(wd->items, item);
-                  count ++;
-               }
-          }
-     }
-}
-
-static int
-_hex_string_get(char ch)
-{
-   if ((ch >= '0') && (ch <= '9')) return (ch - '0');
-   else if ((ch >= 'A') && (ch <= 'F')) return (ch - 'A' + 10);
-   else if ((ch >= 'a') && (ch <= 'f')) return (ch - 'a' + 10);
-   return 0;
-}
-
-static void
-_color_parse(const char *str, unsigned char *r, unsigned char *g, unsigned char *b)
-{
-   int slen;
-
-   slen = strlen(str);
-   *r = *g = *b = 0;
-
-   if (slen == 7) /* #RRGGBB */
-     {
-        *r = (_hex_string_get(str[1]) << 4) | (_hex_string_get(str[2]));
-        *g = (_hex_string_get(str[3]) << 4) | (_hex_string_get(str[4]));
-        *b = (_hex_string_get(str[5]) << 4) | (_hex_string_get(str[6]));
-     }
-   *r = (*r * 0xff) / 255;
-   *g = (*g * 0xff) / 255;
-   *b = (*b * 0xff) / 255;
-}
-
-EAPI Evas_Object *elm_colorpalette_add(Evas_Object *parent)
-{
-   Evas_Object *obj = NULL;
-   Widget_Data *wd = NULL;
-   Evas *e;
-   Eina_List *colors;
-   const Eina_List *l;
-   const char *color_code;
-   const char *rowstr, *colstr, *color_numstr;
-   int color_num = 10;
-   int row = 2;
-   int col = 5;
-   int index = 0;
-
-   ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL);
-
-   ELM_SET_WIDTYPE(widtype, "colorpalette");
-   elm_widget_type_set(obj, "colorpalette");
-   elm_widget_sub_object_add(parent, obj);
-   elm_widget_data_set(obj, wd);
-   elm_widget_del_hook_set(obj, _del_hook);
-   elm_widget_theme_hook_set(obj, _theme_hook);
-
-   wd->base = edje_object_add(e);
-   _elm_theme_object_set(obj, wd->base, "colorpalette", "base", "default");
-   elm_widget_resize_object_set(obj, wd->base);
-
-   color_numstr = edje_object_data_get(wd->base, "color_num");
-   if (color_numstr) color_num = atoi(color_numstr); /* Need to get this value
-   from edc inorder to allocate memory in advance: Think of a better way*/
-   rowstr = edje_object_data_get(wd->base, "row");
-   if (rowstr) row = atoi(rowstr);
-   colstr = edje_object_data_get(wd->base, "col");
-   if (colstr) col = atoi(colstr);
-   wd->color = (Elm_Colorpalette_Color*) calloc (color_num, sizeof(Elm_Colorpalette_Color));
-   colors = elm_widget_stringlist_get(edje_object_data_get(wd->base, "colors"));
-   EINA_LIST_FOREACH(colors, l, color_code)
-     {
-        unsigned char r, g, b;
-        /*Optimized color parsing algorithm*/
-        _color_parse(color_code, &r, &g, &b);
-        /*TODO: Make color storing structure and item also take unsigned char*/
-        wd->color[index].r = (unsigned int)r;
-        wd->color[index].g = (unsigned int)g;
-        wd->color[index].b = (unsigned int)b;
-        index++;
-     }
-   elm_widget_stringlist_free(colors);
-   _color_table_update(obj, row, col, color_num, wd->color);
-   evas_object_event_callback_add(wd->base, EVAS_CALLBACK_RESIZE, _colorpalette_object_resize, obj);
-   _sizing_eval(obj);
-   return obj;
-}
-
-
-EAPI void elm_colorpalette_color_set(Evas_Object *obj, int color_num, Elm_Colorpalette_Color *color)
-{
-   ELM_CHECK_WIDTYPE(obj, widtype);
-   Widget_Data *wd = elm_widget_data_get(obj);
-   int i;
-
-   if (color_num > MAX_NUM_COLORS) return;
-   if (!wd) return;
-
-   if (wd->color)
-     {
-        free(wd->color);
-        wd->color = NULL;
-     }
-   wd->color = (Elm_Colorpalette_Color*) calloc (color_num, sizeof(Elm_Colorpalette_Color));
-   for (i = 0; i < color_num; i++)
-     {
-        wd->color[i].r = color[i].r;
-        wd->color[i].g = color[i].g;
-        wd->color[i].b = color[i].b;
-     }
-   _color_table_update(obj, wd->row, wd->col, color_num, wd->color);
-   _sizing_eval(obj);
-}
-
-EAPI void elm_colorpalette_row_column_set(Evas_Object *obj, int row, int col)
-{
-   ELM_CHECK_WIDTYPE(obj, widtype);
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return;
-   /*Row can be incomplete with atleast one color*/
-   if(((row-1)*col) > MAX_NUM_COLORS) return;
-   _color_table_update(obj, row, col, wd->num, wd->color);
-   _sizing_eval(obj);
-}
-
diff --git a/src/lib/elm_colorpalette.h b/src/lib/elm_colorpalette.h
deleted file mode 100644 (file)
index 6316d70..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-   /**
-    * @defgroup Colorpalette Colorpalette
-    * @ingroup Elementary
-    * @addtogroup Colorpalette
-    * @{
-    *
-    * Using colorpalette, you can select a color by clicking
-    * a color rectangle on the colorpalette.
-    *
-    * Smart callbacks that you can add are:
-    *
-    * clicked - This signal is sent when a color rectangle is clicked.
-    */
-   typedef struct _Colorpalette_Color Elm_Colorpalette_Color;
-   struct _Colorpalette_Color
-     {
-        unsigned int r, g, b;
-     };
-
-   /**
-    * Add a new colorpalette to the parent.
-    *
-    * @param parent The parent object
-    * @return The new object or NULL if it cannot be created
-    *
-    * @ingroup Colorpalette
-    */
-   EAPI Evas_Object *elm_colorpalette_add(Evas_Object *parent);
-   /**
-    * Set colors to the colorpalette.
-    *
-    * @param obj   Colorpalette object
-    * @param color_num     number of the colors on the colorpalette
-    * @param color     Color lists
-    */
-   EAPI void         elm_colorpalette_color_set(Evas_Object *obj, int color_num, Elm_Colorpalette_Color *color);
-   /**
-    * Set row/column value for the colorpalette.
-    *
-    * @param obj   Colorpalette object
-    * @param row   row value for the colorpalette
-    * @param col   column value for the colorpalette
-    */
-   EAPI void         elm_colorpalette_row_column_set(Evas_Object *obj, int row, int col);
-
-   /**
-    * @}
-    */
-