Merge "[elm_label]Changed *.c file mode & Fix build fail & remove warning in TC"

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_expanded_get_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_expanded_get_func.c
index d385453..80be942 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_expanded_get_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_expanded_get_func.c
@@ -87,7 +87,7 @@ static void utc_UIFW_elm_genlist_item_expanded_get_func_01(void)
        Eina_Bool ret = EINA_FALSE;
 
        item = elm_genlist_item_append(genlist, &itc, (void *) 0, NULL,
-                       ELM_GENLIST_ITEM_NONE, NULL, NULL);
+                       ELM_GENLIST_ITEM_SUBITEMS, NULL, NULL);
        elm_genlist_item_expanded_set(item, 1);
 
        ret = elm_genlist_item_expanded_get(item);

diff --git a/debian/libelm.install b/debian/libelm.install
index 0fb1fd1..9137d7f 100644 (file)
--- a/debian/libelm.install
+++ b/debian/libelm.install
@@ -11,3 +11,4 @@ debian/tmp/usr/share/elementary/config/slp/*
 debian/tmp/usr/share/elementary/config/standard/*
 debian/tmp/usr/share/icons/elementary.png
 debian/tmp/usr/lib/elementary/*
+debian/tmp/usr/share/locale/*

diff --git a/po/ar.po b/po/ar.po
index b5d3c7f..3999498 100644 (file)
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: elementary\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-07-19 17:25+0900\n"
+"POT-Creation-Date: 2011-09-22 15:31+0900\n"
 "PO-Revision-Date: 2010-12-26 10:05+0200\n"
 "Last-Translator: Tom Hacohen <tom.hacohen@partner.samsung.com>\n"
 "Language-Team: General\n"
@@ -17,42 +17,47 @@ msgstr ""
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: src/lib/elc_fileselector.c:853
+#: src/lib/elc_fileselector.c:855
 msgid "Up"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:868
+#: src/lib/elc_fileselector.c:870
 msgid "Home"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:1056 src/lib/elm_entry.c:1283
+#: src/lib/elc_fileselector.c:1058 src/lib/elm_entry.c:1309
+#: src/lib/elm_searchbar.c:221
 msgid "Cancel"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:1066
+#: src/lib/elc_fileselector.c:1068
 msgid "OK"
 msgstr ""
 
-#: src/lib/elm_config.c:1650
+#: src/lib/elm_config.c:1648
 msgid "default:LTR"
 msgstr "default:RTL"
 
-#: src/lib/elm_entry.c:1257
+#: src/lib/elm_entry.c:1283
 msgid "Select"
 msgstr ""
 
-#: src/lib/elm_entry.c:1262
+#: src/lib/elm_entry.c:1288
 msgid "Paste"
 msgstr ""
 
-#: src/lib/elm_entry.c:1267 src/lib/elm_entry.c:1287
+#: src/lib/elm_entry.c:1293 src/lib/elm_entry.c:1313
 msgid "More"
 msgstr ""
 
-#: src/lib/elm_entry.c:1277
+#: src/lib/elm_entry.c:1303
 msgid "Copy"
 msgstr ""
 
-#: src/lib/elm_entry.c:1280
+#: src/lib/elm_entry.c:1306
 msgid "Cut"
 msgstr ""
+
+#: src/lib/elm_searchbar.c:204
+msgid "Search"
+msgstr ""

diff --git a/po/az_IR.po b/po/az_IR.po
index 9da2558..2d28931 100644 (file)
--- a/po/az_IR.po
+++ b/po/az_IR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: elementary\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-07-19 17:25+0900\n"
+"POT-Creation-Date: 2011-09-22 15:31+0900\n"
 "PO-Revision-Date: 2010-12-26 10:05+0200\n"
 "Last-Translator: Tom Hacohen <tom.hacohen@partner.samsung.com>\n"
 "Language-Team: General\n"
@@ -16,42 +16,47 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/lib/elc_fileselector.c:853
+#: src/lib/elc_fileselector.c:855
 msgid "Up"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:868
+#: src/lib/elc_fileselector.c:870
 msgid "Home"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:1056 src/lib/elm_entry.c:1283
+#: src/lib/elc_fileselector.c:1058 src/lib/elm_entry.c:1309
+#: src/lib/elm_searchbar.c:221
 msgid "Cancel"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:1066
+#: src/lib/elc_fileselector.c:1068
 msgid "OK"
 msgstr ""
 
-#: src/lib/elm_config.c:1650
+#: src/lib/elm_config.c:1648
 msgid "default:LTR"
 msgstr "default:RTL"
 
-#: src/lib/elm_entry.c:1257
+#: src/lib/elm_entry.c:1283
 msgid "Select"
 msgstr ""
 
-#: src/lib/elm_entry.c:1262
+#: src/lib/elm_entry.c:1288
 msgid "Paste"
 msgstr ""
 
-#: src/lib/elm_entry.c:1267 src/lib/elm_entry.c:1287
+#: src/lib/elm_entry.c:1293 src/lib/elm_entry.c:1313
 msgid "More"
 msgstr ""
 
-#: src/lib/elm_entry.c:1277
+#: src/lib/elm_entry.c:1303
 msgid "Copy"
 msgstr ""
 
-#: src/lib/elm_entry.c:1280
+#: src/lib/elm_entry.c:1306
 msgid "Cut"
 msgstr ""
+
+#: src/lib/elm_searchbar.c:204
+msgid "Search"
+msgstr ""

diff --git a/po/de.po b/po/de.po
index 272ecd2..3640ca7 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: elementary 0.7.0.57309\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-07-19 17:25+0900\n"
+"POT-Creation-Date: 2011-09-22 15:31+0900\n"
 "PO-Revision-Date: 2011-02-25 20:22+0100\n"
-"Last-Translator: Fabian Nowak <timystery@arcor.de>\n"
+"Last-Translator: Shilpa Singh <shilpa.singh@samsung.com>\n"
 "Language-Team: German\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -18,42 +18,47 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/lib/elc_fileselector.c:853
+#: src/lib/elc_fileselector.c:855
 msgid "Up"
 msgstr "Aufwärts"
 
-#: src/lib/elc_fileselector.c:868
+#: src/lib/elc_fileselector.c:870
 msgid "Home"
 msgstr "Persönlicher Ordner"
 
-#: src/lib/elc_fileselector.c:1056 src/lib/elm_entry.c:1283
+#: src/lib/elc_fileselector.c:1058 src/lib/elm_entry.c:1309
+#: src/lib/elm_searchbar.c:221
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: src/lib/elc_fileselector.c:1066
+#: src/lib/elc_fileselector.c:1068
 msgid "OK"
 msgstr "OK"
 
-#: src/lib/elm_config.c:1650
+#: src/lib/elm_config.c:1648
 msgid "default:LTR"
 msgstr "Standard: LTR"
 
-#: src/lib/elm_entry.c:1257
+#: src/lib/elm_entry.c:1283
 msgid "Select"
 msgstr "Auswählen"
 
-#: src/lib/elm_entry.c:1262
+#: src/lib/elm_entry.c:1288
 msgid "Paste"
 msgstr "Einfügen"
 
-#: src/lib/elm_entry.c:1267 src/lib/elm_entry.c:1287
+#: src/lib/elm_entry.c:1293 src/lib/elm_entry.c:1313
 msgid "More"
 msgstr ""
 
-#: src/lib/elm_entry.c:1277
+#: src/lib/elm_entry.c:1303
 msgid "Copy"
 msgstr "Kopieren"
 
-#: src/lib/elm_entry.c:1280
+#: src/lib/elm_entry.c:1306
 msgid "Cut"
 msgstr "Ausschneiden"
+
+#: src/lib/elm_searchbar.c:204
+msgid "Search"
+msgstr "Suche"

diff --git a/po/fa.po b/po/fa.po
index 9da2558..2d28931 100644 (file)
--- a/po/fa.po
+++ b/po/fa.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: elementary\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-07-19 17:25+0900\n"
+"POT-Creation-Date: 2011-09-22 15:31+0900\n"
 "PO-Revision-Date: 2010-12-26 10:05+0200\n"
 "Last-Translator: Tom Hacohen <tom.hacohen@partner.samsung.com>\n"
 "Language-Team: General\n"
@@ -16,42 +16,47 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/lib/elc_fileselector.c:853
+#: src/lib/elc_fileselector.c:855
 msgid "Up"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:868
+#: src/lib/elc_fileselector.c:870
 msgid "Home"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:1056 src/lib/elm_entry.c:1283
+#: src/lib/elc_fileselector.c:1058 src/lib/elm_entry.c:1309
+#: src/lib/elm_searchbar.c:221
 msgid "Cancel"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:1066
+#: src/lib/elc_fileselector.c:1068
 msgid "OK"
 msgstr ""
 
-#: src/lib/elm_config.c:1650
+#: src/lib/elm_config.c:1648
 msgid "default:LTR"
 msgstr "default:RTL"
 
-#: src/lib/elm_entry.c:1257
+#: src/lib/elm_entry.c:1283
 msgid "Select"
 msgstr ""
 
-#: src/lib/elm_entry.c:1262
+#: src/lib/elm_entry.c:1288
 msgid "Paste"
 msgstr ""
 
-#: src/lib/elm_entry.c:1267 src/lib/elm_entry.c:1287
+#: src/lib/elm_entry.c:1293 src/lib/elm_entry.c:1313
 msgid "More"
 msgstr ""
 
-#: src/lib/elm_entry.c:1277
+#: src/lib/elm_entry.c:1303
 msgid "Copy"
 msgstr ""
 
-#: src/lib/elm_entry.c:1280
+#: src/lib/elm_entry.c:1306
 msgid "Cut"
 msgstr ""
+
+#: src/lib/elm_searchbar.c:204
+msgid "Search"
+msgstr ""

diff --git a/po/fr.po b/po/fr.po
index a3c6c75..5ef2c2a 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,9 +5,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Elementary\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-07-19 17:25+0900\n"
+"POT-Creation-Date: 2011-09-22 15:31+0900\n"
 "PO-Revision-Date: 2011-03-26 08:13+0400\n"
-"Last-Translator: batden <batden@orange.fr>\n"
+"Last-Translator: Shilpa Singh <shilpa.singh@samsung.com>\n"
 "Language-Team: Enlightenment French Team <pourunmondesansgourou@gmail.com>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
@@ -18,42 +18,47 @@ msgstr ""
 "X-Poedit-Country: FRANCE\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: src/lib/elc_fileselector.c:853
+#: src/lib/elc_fileselector.c:855
 msgid "Up"
 msgstr "Monter"
 
-#: src/lib/elc_fileselector.c:868
+#: src/lib/elc_fileselector.c:870
 msgid "Home"
 msgstr "Home"
 
-#: src/lib/elc_fileselector.c:1056 src/lib/elm_entry.c:1283
+#: src/lib/elc_fileselector.c:1058 src/lib/elm_entry.c:1309
+#: src/lib/elm_searchbar.c:221
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/lib/elc_fileselector.c:1066
+#: src/lib/elc_fileselector.c:1068
 msgid "OK"
 msgstr "OK"
 
-#: src/lib/elm_config.c:1650
+#: src/lib/elm_config.c:1648
 msgid "default:LTR"
 msgstr "LTR par défaut"
 
-#: src/lib/elm_entry.c:1257
+#: src/lib/elm_entry.c:1283
 msgid "Select"
 msgstr "Sélectionner"
 
-#: src/lib/elm_entry.c:1262
+#: src/lib/elm_entry.c:1288
 msgid "Paste"
 msgstr "Coller"
 
-#: src/lib/elm_entry.c:1267 src/lib/elm_entry.c:1287
+#: src/lib/elm_entry.c:1293 src/lib/elm_entry.c:1313
 msgid "More"
 msgstr ""
 
-#: src/lib/elm_entry.c:1277
+#: src/lib/elm_entry.c:1303
 msgid "Copy"
 msgstr "Copier"
 
-#: src/lib/elm_entry.c:1280
+#: src/lib/elm_entry.c:1306
 msgid "Cut"
 msgstr "Couper"
+
+#: src/lib/elm_searchbar.c:204
+msgid "Search"
+msgstr "Rechercher"

diff --git a/po/he.po b/po/he.po
index d0a7e9d..9f2bf81 100644 (file)
--- a/po/he.po
+++ b/po/he.po
@@ -6,9 +6,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: elementary\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-07-19 17:25+0900\n"
+"POT-Creation-Date: 2011-09-22 15:31+0900\n"
 "PO-Revision-Date: 2010-12-26 10:05+0200\n"
-"Last-Translator: Aharon Hillel <a.hillel@partner.samsung.com>\n"
+"Last-Translator: Shilpa Singh <shilpa.singh@samsung.com>\n"
 "Language-Team: General\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
@@ -16,42 +16,47 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/lib/elc_fileselector.c:853
+#: src/lib/elc_fileselector.c:855
 msgid "Up"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:868
+#: src/lib/elc_fileselector.c:870
 msgid "Home"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:1056 src/lib/elm_entry.c:1283
+#: src/lib/elc_fileselector.c:1058 src/lib/elm_entry.c:1309
+#: src/lib/elm_searchbar.c:221
 msgid "Cancel"
 msgstr "בטל"
 
-#: src/lib/elc_fileselector.c:1066
+#: src/lib/elc_fileselector.c:1068
 msgid "OK"
 msgstr "אשר"
 
-#: src/lib/elm_config.c:1650
+#: src/lib/elm_config.c:1648
 msgid "default:LTR"
 msgstr "default:RTL"
 
-#: src/lib/elm_entry.c:1257
+#: src/lib/elm_entry.c:1283
 msgid "Select"
 msgstr "התחל בחירה"
 
-#: src/lib/elm_entry.c:1262
+#: src/lib/elm_entry.c:1288
 msgid "Paste"
 msgstr "הדבק"
 
-#: src/lib/elm_entry.c:1267 src/lib/elm_entry.c:1287
+#: src/lib/elm_entry.c:1293 src/lib/elm_entry.c:1313
 msgid "More"
 msgstr ""
 
-#: src/lib/elm_entry.c:1277
+#: src/lib/elm_entry.c:1303
 msgid "Copy"
 msgstr "העתק"
 
-#: src/lib/elm_entry.c:1280
+#: src/lib/elm_entry.c:1306
 msgid "Cut"
 msgstr "גזור"
+
+#: src/lib/elm_searchbar.c:204
+msgid "Search"
+msgstr "לחפש"

diff --git a/po/it.po b/po/it.po
index 519e614..369b5d8 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -5,51 +5,56 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Elementary\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-07-19 17:25+0900\n"
+"POT-Creation-Date: 2011-09-22 15:31+0900\n"
 "PO-Revision-Date: 2011-03-26 13:53+0100\n"
-"Last-Translator: Massimo Maiurana <maiurana@gmail.com>\n"
+"Last-Translator: Shilpa Singh <shilpa.singh@samsung.com>\n"
 "Language-Team: none\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/lib/elc_fileselector.c:853
+#: src/lib/elc_fileselector.c:855
 msgid "Up"
 msgstr "Su"
 
-#: src/lib/elc_fileselector.c:868
+#: src/lib/elc_fileselector.c:870
 msgid "Home"
 msgstr "Home"
 
-#: src/lib/elc_fileselector.c:1056 src/lib/elm_entry.c:1283
+#: src/lib/elc_fileselector.c:1058 src/lib/elm_entry.c:1309
+#: src/lib/elm_searchbar.c:221
 msgid "Cancel"
 msgstr "Annulla"
 
-#: src/lib/elc_fileselector.c:1066
+#: src/lib/elc_fileselector.c:1068
 msgid "OK"
 msgstr "OK"
 
-#: src/lib/elm_config.c:1650
+#: src/lib/elm_config.c:1648
 msgid "default:LTR"
 msgstr "predefintito: LTR"
 
-#: src/lib/elm_entry.c:1257
+#: src/lib/elm_entry.c:1283
 msgid "Select"
 msgstr "Seleziona"
 
-#: src/lib/elm_entry.c:1262
+#: src/lib/elm_entry.c:1288
 msgid "Paste"
 msgstr "Incolla"
 
-#: src/lib/elm_entry.c:1267 src/lib/elm_entry.c:1287
+#: src/lib/elm_entry.c:1293 src/lib/elm_entry.c:1313
 msgid "More"
 msgstr ""
 
-#: src/lib/elm_entry.c:1277
+#: src/lib/elm_entry.c:1303
 msgid "Copy"
 msgstr "Copia"
 
-#: src/lib/elm_entry.c:1280
+#: src/lib/elm_entry.c:1306
 msgid "Cut"
-msgstr "Taglia"
+msgstr "Taglio"
+
+#: src/lib/elm_searchbar.c:204
+msgid "Search"
+msgstr "Ricerca"

diff --git a/po/ko_KR.po b/po/ko_KR.po
index 469e86a..0469cfb 100644 (file)
--- a/po/ko_KR.po
+++ b/po/ko_KR.po
@@ -6,9 +6,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: elementary\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-07-19 17:25+0900\n"
+"POT-Creation-Date: 2011-09-22 15:31+0900\n"
 "PO-Revision-Date: 2011-02-22 09:09-0800\n"
-"Last-Translator: Daniel Juyung Seo <seojuyung@gmail.com>\n"
+"Last-Translator: Shilpa Singh <shilpa.singh@samsung.com>\n"
 "Language-Team: General\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
@@ -16,42 +16,47 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/lib/elc_fileselector.c:853
+#: src/lib/elc_fileselector.c:855
 msgid "Up"
 msgstr "위로"
 
-#: src/lib/elc_fileselector.c:868
+#: src/lib/elc_fileselector.c:870
 msgid "Home"
 msgstr "홈"
 
-#: src/lib/elc_fileselector.c:1056 src/lib/elm_entry.c:1283
+#: src/lib/elc_fileselector.c:1058 src/lib/elm_entry.c:1309
+#: src/lib/elm_searchbar.c:221
 msgid "Cancel"
 msgstr "취소"
 
-#: src/lib/elc_fileselector.c:1066
+#: src/lib/elc_fileselector.c:1068
 msgid "OK"
 msgstr "확인"
 
-#: src/lib/elm_config.c:1650
+#: src/lib/elm_config.c:1648
 msgid "default:LTR"
-msgstr "default:RTL"
+msgstr ""
 
-#: src/lib/elm_entry.c:1257
+#: src/lib/elm_entry.c:1283
 msgid "Select"
 msgstr "선택"
 
-#: src/lib/elm_entry.c:1262
+#: src/lib/elm_entry.c:1288
 msgid "Paste"
 msgstr "붙여넣기"
 
-#: src/lib/elm_entry.c:1267 src/lib/elm_entry.c:1287
+#: src/lib/elm_entry.c:1293 src/lib/elm_entry.c:1313
 msgid "More"
 msgstr ""
 
-#: src/lib/elm_entry.c:1277
+#: src/lib/elm_entry.c:1303
 msgid "Copy"
 msgstr "복사"
 
-#: src/lib/elm_entry.c:1280
+#: src/lib/elm_entry.c:1306
 msgid "Cut"
 msgstr "잘라내기"
+
+#: src/lib/elm_searchbar.c:204
+msgid "Search"
+msgstr "검색"

diff --git a/po/nl.po b/po/nl.po
index aae24de..e546014 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: elementary 0.7.0.57309\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-07-19 17:25+0900\n"
+"POT-Creation-Date: 2011-09-22 15:31+0900\n"
 "PO-Revision-Date: 2011-06-19 16:41+0100\n"
-"Last-Translator: Heimen Stoffels <vistausss@gmail.com>\n"
+"Last-Translator: Shilpa Singh <shilpa.singh@samsung.com>\n"
 "Language-Team: Dutch <vistausss@gmail.com>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -20,42 +20,47 @@ msgstr ""
 "X-Poedit-Language: Dutch\n"
 "X-Poedit-Country: NETHERLANDS\n"
 
-#: src/lib/elc_fileselector.c:853
+#: src/lib/elc_fileselector.c:855
 msgid "Up"
 msgstr "Omhoog"
 
-#: src/lib/elc_fileselector.c:868
+#: src/lib/elc_fileselector.c:870
 msgid "Home"
 msgstr "Persoonlijke map"
 
-#: src/lib/elc_fileselector.c:1056 src/lib/elm_entry.c:1283
+#: src/lib/elc_fileselector.c:1058 src/lib/elm_entry.c:1309
+#: src/lib/elm_searchbar.c:221
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: src/lib/elc_fileselector.c:1066
+#: src/lib/elc_fileselector.c:1068
 msgid "OK"
 msgstr "OK"
 
-#: src/lib/elm_config.c:1650
+#: src/lib/elm_config.c:1648
 msgid "default:LTR"
 msgstr "Standaard: LTR"
 
-#: src/lib/elm_entry.c:1257
+#: src/lib/elm_entry.c:1283
 msgid "Select"
 msgstr "Selecteren"
 
-#: src/lib/elm_entry.c:1262
+#: src/lib/elm_entry.c:1288
 msgid "Paste"
 msgstr "Plakken"
 
-#: src/lib/elm_entry.c:1267 src/lib/elm_entry.c:1287
+#: src/lib/elm_entry.c:1293 src/lib/elm_entry.c:1313
 msgid "More"
 msgstr ""
 
-#: src/lib/elm_entry.c:1277
+#: src/lib/elm_entry.c:1303
 msgid "Copy"
 msgstr "Kopiëren"
 
-#: src/lib/elm_entry.c:1280
+#: src/lib/elm_entry.c:1306
 msgid "Cut"
 msgstr "Knippen"
+
+#: src/lib/elm_searchbar.c:204
+msgid "Search"
+msgstr "Zoeken"

diff --git a/po/ps.po b/po/ps.po
index 5424793..dbc73d2 100644 (file)
--- a/po/ps.po
+++ b/po/ps.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: elementary\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-07-19 17:25+0900\n"
+"POT-Creation-Date: 2011-09-22 15:31+0900\n"
 "PO-Revision-Date: 2010-12-26 10:05+0200\n"
 "Last-Translator: Tom Hacohen <tom.hacohen@partner.samsung.com>\n"
 "Language-Team: General\n"
@@ -15,42 +15,47 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/lib/elc_fileselector.c:853
+#: src/lib/elc_fileselector.c:855
 msgid "Up"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:868
+#: src/lib/elc_fileselector.c:870
 msgid "Home"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:1056 src/lib/elm_entry.c:1283
+#: src/lib/elc_fileselector.c:1058 src/lib/elm_entry.c:1309
+#: src/lib/elm_searchbar.c:221
 msgid "Cancel"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:1066
+#: src/lib/elc_fileselector.c:1068
 msgid "OK"
 msgstr ""
 
-#: src/lib/elm_config.c:1650
+#: src/lib/elm_config.c:1648
 msgid "default:LTR"
 msgstr "default:RTL"
 
-#: src/lib/elm_entry.c:1257
+#: src/lib/elm_entry.c:1283
 msgid "Select"
 msgstr ""
 
-#: src/lib/elm_entry.c:1262
+#: src/lib/elm_entry.c:1288
 msgid "Paste"
 msgstr ""
 
-#: src/lib/elm_entry.c:1267 src/lib/elm_entry.c:1287
+#: src/lib/elm_entry.c:1293 src/lib/elm_entry.c:1313
 msgid "More"
 msgstr ""
 
-#: src/lib/elm_entry.c:1277
+#: src/lib/elm_entry.c:1303
 msgid "Copy"
 msgstr ""
 
-#: src/lib/elm_entry.c:1280
+#: src/lib/elm_entry.c:1306
 msgid "Cut"
 msgstr ""
+
+#: src/lib/elm_searchbar.c:204
+msgid "Search"
+msgstr ""

diff --git a/po/pt.po b/po/pt.po
index 5184951..4e4a4b5 100644 (file)
--- a/po/pt.po
+++ b/po/pt.po
@@ -5,9 +5,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Elementary\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-07-19 17:25+0900\n"
+"POT-Creation-Date: 2011-09-22 15:31+0900\n"
 "PO-Revision-Date: 2011-02-16 11:42-0000\n"
-"Last-Translator: Sérgio Marques <smarquespt@gmail.com>\n"
+"Last-Translator: Shilpa Singh <shilpa.singh@samsung.com>\n"
 "Language-Team: \n"
 "Language: \n"
 "MIME-Version: 1.0\n"
@@ -16,42 +16,47 @@ msgstr ""
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-Country: Portugal\n"
 
-#: src/lib/elc_fileselector.c:853
+#: src/lib/elc_fileselector.c:855
 msgid "Up"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:868
+#: src/lib/elc_fileselector.c:870
 msgid "Home"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:1056 src/lib/elm_entry.c:1283
+#: src/lib/elc_fileselector.c:1058 src/lib/elm_entry.c:1309
+#: src/lib/elm_searchbar.c:221
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/lib/elc_fileselector.c:1066
+#: src/lib/elc_fileselector.c:1068
 msgid "OK"
 msgstr ""
 
-#: src/lib/elm_config.c:1650
+#: src/lib/elm_config.c:1648
 msgid "default:LTR"
 msgstr "omissão:LTR"
 
-#: src/lib/elm_entry.c:1257
+#: src/lib/elm_entry.c:1283
 msgid "Select"
 msgstr "Selecionar"
 
-#: src/lib/elm_entry.c:1262
+#: src/lib/elm_entry.c:1288
 msgid "Paste"
 msgstr "Colar"
 
-#: src/lib/elm_entry.c:1267 src/lib/elm_entry.c:1287
+#: src/lib/elm_entry.c:1293 src/lib/elm_entry.c:1313
 msgid "More"
 msgstr ""
 
-#: src/lib/elm_entry.c:1277
+#: src/lib/elm_entry.c:1303
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/lib/elm_entry.c:1280
+#: src/lib/elm_entry.c:1306
 msgid "Cut"
 msgstr "Cortar"
+
+#: src/lib/elm_searchbar.c:204
+msgid "Search"
+msgstr "Búsqueda"

diff --git a/po/ur.po b/po/ur.po
index 5424793..dbc73d2 100644 (file)
--- a/po/ur.po
+++ b/po/ur.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: elementary\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-07-19 17:25+0900\n"
+"POT-Creation-Date: 2011-09-22 15:31+0900\n"
 "PO-Revision-Date: 2010-12-26 10:05+0200\n"
 "Last-Translator: Tom Hacohen <tom.hacohen@partner.samsung.com>\n"
 "Language-Team: General\n"
@@ -15,42 +15,47 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/lib/elc_fileselector.c:853
+#: src/lib/elc_fileselector.c:855
 msgid "Up"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:868
+#: src/lib/elc_fileselector.c:870
 msgid "Home"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:1056 src/lib/elm_entry.c:1283
+#: src/lib/elc_fileselector.c:1058 src/lib/elm_entry.c:1309
+#: src/lib/elm_searchbar.c:221
 msgid "Cancel"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:1066
+#: src/lib/elc_fileselector.c:1068
 msgid "OK"
 msgstr ""
 
-#: src/lib/elm_config.c:1650
+#: src/lib/elm_config.c:1648
 msgid "default:LTR"
 msgstr "default:RTL"
 
-#: src/lib/elm_entry.c:1257
+#: src/lib/elm_entry.c:1283
 msgid "Select"
 msgstr ""
 
-#: src/lib/elm_entry.c:1262
+#: src/lib/elm_entry.c:1288
 msgid "Paste"
 msgstr ""
 
-#: src/lib/elm_entry.c:1267 src/lib/elm_entry.c:1287
+#: src/lib/elm_entry.c:1293 src/lib/elm_entry.c:1313
 msgid "More"
 msgstr ""
 
-#: src/lib/elm_entry.c:1277
+#: src/lib/elm_entry.c:1303
 msgid "Copy"
 msgstr ""
 
-#: src/lib/elm_entry.c:1280
+#: src/lib/elm_entry.c:1306
 msgid "Cut"
 msgstr ""
+
+#: src/lib/elm_searchbar.c:204
+msgid "Search"
+msgstr ""

diff --git a/po/yi.po b/po/yi.po
index 5424793..dbc73d2 100644 (file)
--- a/po/yi.po
+++ b/po/yi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: elementary\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-07-19 17:25+0900\n"
+"POT-Creation-Date: 2011-09-22 15:31+0900\n"
 "PO-Revision-Date: 2010-12-26 10:05+0200\n"
 "Last-Translator: Tom Hacohen <tom.hacohen@partner.samsung.com>\n"
 "Language-Team: General\n"
@@ -15,42 +15,47 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/lib/elc_fileselector.c:853
+#: src/lib/elc_fileselector.c:855
 msgid "Up"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:868
+#: src/lib/elc_fileselector.c:870
 msgid "Home"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:1056 src/lib/elm_entry.c:1283
+#: src/lib/elc_fileselector.c:1058 src/lib/elm_entry.c:1309
+#: src/lib/elm_searchbar.c:221
 msgid "Cancel"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:1066
+#: src/lib/elc_fileselector.c:1068
 msgid "OK"
 msgstr ""
 
-#: src/lib/elm_config.c:1650
+#: src/lib/elm_config.c:1648
 msgid "default:LTR"
 msgstr "default:RTL"
 
-#: src/lib/elm_entry.c:1257
+#: src/lib/elm_entry.c:1283
 msgid "Select"
 msgstr ""
 
-#: src/lib/elm_entry.c:1262
+#: src/lib/elm_entry.c:1288
 msgid "Paste"
 msgstr ""
 
-#: src/lib/elm_entry.c:1267 src/lib/elm_entry.c:1287
+#: src/lib/elm_entry.c:1293 src/lib/elm_entry.c:1313
 msgid "More"
 msgstr ""
 
-#: src/lib/elm_entry.c:1277
+#: src/lib/elm_entry.c:1303
 msgid "Copy"
 msgstr ""
 
-#: src/lib/elm_entry.c:1280
+#: src/lib/elm_entry.c:1306
 msgid "Cut"
 msgstr ""
+
+#: src/lib/elm_searchbar.c:204
+msgid "Search"
+msgstr ""

diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index cd2b022..8ae8d2f 100644 (file)
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -8279,20 +8279,174 @@ extern "C" {
   #define ELM_NAVIFRAME_ITEM_OPTIONHEADER "elm.swallow.optionheader"
   #define ELM_NAVIFRAME_ITEM_TITLE_LABEL "elm.text.title"
   #define ELM_NAVIFRAME_ITEM_PREV_BTN "elm.swallow.prev_btn"
-  #define ELM_NAVIFRAME_ITEM_SIGNAL_OPTIONHEADER_CLOSE "elm,state,optionheader,instant_close", ""
-  #define ELM_NAVIFRAME_ITEM_SIGNAL_OPTIONHEADER_OPEN "elm,state,optionheader,instant_open", ""
+  #define ELM_NAVIFRAME_ITEM_SIGNAL_OPTIONHEADER_CLOSE "elm,state,optionheader,close", ""
+  #define ELM_NAVIFRAME_ITEM_SIGNAL_OPTIONHEADER_OPEN "elm,state,optionheader,open", ""
+  #define ELM_NAVIFRAME_ITEM_SIGNAL_OPTIONHEADER_INSTANT_CLOSE "elm,state,optionheader,instant_close", ""
+  #define ELM_NAVIFRAME_ITEM_SIGNAL_OPTIONHEADER_INSTANT_OPEN "elm,state,optionheader,instant_open", ""
 
+  /**
+    * @defgroup Naviframe Naviframe
+    *
+    * @brief Naviframe is a kind of view manager for the applications.
+    *
+    * Naviframe provides functions to switch different pages with stack
+    * mechanism. It means if one page(item) needs to be changed to the new one,
+    * then naviframe would push the new page to it's internal stack. Of course,
+    * it can be back to the previous page by popping the top page. Naviframe
+    * provides some transition effect while the pages are switching (same as
+    * pager).
+    *
+    * Since each item could keep the different styles, users could keep the
+    * same look & feel for the pages or different styles for the items in it's
+    * application.
+    *
+    * Signals that you can add callback for are:
+    *
+    * @li "transition,finished" - When the transition is finished in changing
+    *     the item
+    * @li "title,clicked" - User clicked title area
+    *
+    * Default contents parts for the naviframe items that you can use for are:
+    *
+    * @li "elm.swallow.content" - The main content of the page
+    * @li "elm.swallow.prev_btn" - The button to go to the previous page
+    * @li "elm.swallow.next_btn" - The button to go to the next page
+    *
+    * Default text parts of naviframe items that you can be used are:
+    *
+    * @li "elm.text.title" - The title label in the title area
+    *
+    * @ref tutorial_naviframe gives a good overview of the usage of the API.
+    * @{
+    */
+   /**
+    * @brief Add a new Naviframe object to the parent.
+    *
+    * @param parent Parent object
+    * @return New object or @c NULL, if it cannot be created
+    */
    EAPI Evas_Object        *elm_naviframe_add(Evas_Object *parent) EINA_ARG_NONNULL(1);
+   /**
+    * @brief Push a new item to the top of the naviframe stack (and show it).
+    *
+    * @param obj The naviframe object
+    * @param title_label The label in the title area. The name of the title
+    *        label part is "elm.text.title"
+    * @param prev_btn The button to go to the previous item. If it is NULL,
+    *        then naviframe will create a back button automatically. The name of
+    *        the prev_btn part is "elm.swallow.prev_btn"
+    * @param next_btn The button to go to the next item. Or It could be just an
+    *        extra function button. The name of the next_btn part is
+    *        "elm.swallow.next_btn"
+    * @param content The main content object. The name of content part is
+    *        "elm.swallow.content"
+    * @param item_style The current item style name. @c NULL would be default.
+    * @return The created item or @c NULL upon failure.
+    *
+    * The item pushed becomes one page of the naviframe, this item will be
+    * deleted when it is popped.
+    *
+    * @see also elm_naviframe_item_style_set()
+    *
+    * The following styles are available for this item:
+    * @li @c "default"
+    */
    EAPI Elm_Object_Item    *elm_naviframe_item_push(Evas_Object *obj, const char *title_label, Evas_Object *prev_btn, Evas_Object *next_btn, Evas_Object *content, const char *item_style) EINA_ARG_NONNULL(1, 5);
+   /**
+    * @brief Pop an item that is on top of the stack
+    *
+    * @param obj The naviframe object
+    * @return @c NULL or the content object(if the
+    *         elm_naviframe_content_preserve_on_pop_get is true).
+    *
+    * This pops an item that is on the top(visible) of the naviframe, makes it
+    * disappear, then deletes the item. The item that was underneath it on the
+    * stack will become visible.
+    *
+    * @see also elm_naviframe_content_preserve_on_pop_get()
+    */
    EAPI Evas_Object        *elm_naviframe_item_pop(Evas_Object *obj) EINA_ARG_NONNULL(1);
+   /**
+    * @brief Pop the items between the top and the above one on the given item.
+    *
+    * @param it The naviframe item
+    */
    EAPI void                elm_naviframe_item_pop_to(Elm_Object_Item *it) EINA_ARG_NONNULL(1);
+   /**
+    * @brief preserve the content objects when items are popped.
+    *
+    * @param obj The naviframe object
+    * @param preserve Enable the preserve mode if EINA_TRUE, disable otherwise
+    *
+    * @see also elm_naviframe_content_preserve_on_pop_get()
+    */
    EAPI void                elm_naviframe_content_preserve_on_pop_set(Evas_Object *obj, Eina_Bool preserve) EINA_ARG_NONNULL(1);
+   /**
+    * @brief Get a value whether preserve mode is enabled or not.
+    *
+    * @param obj The naviframe object
+    * @return If @c EINA_TRUE, preserve mode is enabled
+    *
+    * @see also elm_naviframe_content_preserve_on_pop_set()
+    */
    EAPI Eina_Bool           elm_naviframe_content_preserve_on_pop_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
+   /**
+    * @brief Get a top item on the naviframe stack
+    *
+    * @param obj The naviframe object
+    * @return The top item on the naviframe stack or @c NULL, if the stack is
+    *         empty
+    */
    EAPI Elm_Object_Item    *elm_naviframe_top_item_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
+   /**
+    * @brief Get a bottom item on the naviframe stack
+    *
+    * @param obj The naviframe object
+    * @return The bottom item on the naviframe stack or @c NULL, if the stack is
+    *         empty
+    */
    EAPI Elm_Object_Item    *elm_naviframe_bottom_item_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
+   /**
+    * @brief Set an item style
+    *
+    * @param obj The naviframe item
+    * @param item_style The current item style name. @c NULL would be default
+    *
+    * The following styles are available for this item:
+    * @li @c "default"
+    *
+    * @see also elm_naviframe_item_style_get()
+    */
    EAPI void                elm_naviframe_item_style_set(Elm_Object_Item *it, const char *item_style) EINA_ARG_NONNULL(1);
+   /**
+    * @brief Get an item style
+    *
+    * @param obj The naviframe item
+    * @return The current item style name
+    *
+    * @see also elm_naviframe_item_style_set()
+    */
    EAPI const char         *elm_naviframe_item_style_get(const Elm_Object_Item *it) EINA_ARG_NONNULL(1);
+   /**
+    * @brief Show/Hide the title area
+    *
+    * @param it The naviframe item
+    * @param visible If @c EINA_TRUE, title area will be visible, hidden
+    *        otherwise
+    *
+    * When the title area is invisible, then the controls would be hidden so as     * to expand the content area to full-size.
+    *
+    * @see also elm_naviframe_item_title_visible_get()
+    */
    EAPI void                elm_naviframe_item_title_visible_set(Elm_Object_Item *it, Eina_Bool visible) EINA_ARG_NONNULL(1);
+   /**
+    * @brief Get a value whether title area is visible or not.
+    *
+    * @param it The naviframe item
+    * @return If @c EINA_TRUE, title area is visible
+    *
+    * @see also elm_naviframe_item_title_visible_set()
+    */
    EAPI Eina_Bool           elm_naviframe_item_title_visible_get(const Elm_Object_Item *it) EINA_ARG_NONNULL(1);
 
    /* Control Bar */

diff --git a/src/lib/elm_editfield.c b/src/lib/elm_editfield.c
index fa66746..fb21e81 100644 (file)
--- a/src/lib/elm_editfield.c
+++ b/src/lib/elm_editfield.c
@@ -44,6 +44,13 @@ static void _show_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static void _on_focus_hook(void *data, Evas_Object *obj);
 static Eina_Bool _empty_entry(Evas_Object *entry);
 
+static const char SIG_FOCUSED[] = "focused";
+
+static const Evas_Smart_Cb_Description _signals[] = {
+   {SIG_FOCUSED, ""},
+   {NULL, NULL}
+};
+
 static void
 _del_hook(Evas_Object *obj)
 {
@@ -59,7 +66,7 @@ _on_focus_hook(void *data __UNUSED__, Evas_Object *obj)
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd || !wd->base)
       return;
-   if (!elm_widget_focus_get(obj) && !(elm_widget_disabled_get(obj)) )
+   if (!elm_widget_focus_get(obj))
      {
         evas_object_smart_callback_call(obj, "unfocused", NULL);
         wd->editing = EINA_FALSE;
@@ -80,6 +87,10 @@ _on_focus_hook(void *data __UNUSED__, Evas_Object *obj)
                }
           }
      }
+   else
+     {
+        evas_object_smart_callback_call(obj, SIG_FOCUSED, NULL);
+     }
 }
 
 static void
@@ -343,6 +354,7 @@ elm_editfield_add(Evas_Object *parent)
    evas_object_smart_callback_add(wd->entry, "changed", _entry_changed_cb, obj);
    elm_widget_sub_object_add(obj, wd->entry);
    evas_object_show(wd->entry);
+   evas_object_smart_callbacks_descriptions_set(obj, _signals);
    _sizing_eval(obj);
 
    return obj;

diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 058fc3e..52b45fd 100644 (file)
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -171,6 +171,7 @@ struct _Elm_Genlist_Item
    Eina_Bool                     updateme : 1;
    Eina_Bool                     nocache : 1;
    Eina_Bool                     move_effect_enabled : 1;
+   Eina_Bool                     defer_unrealize : 1;
 
    // TODO: refactoring
    Eina_Bool   effect_done : 1;
@@ -1685,6 +1686,20 @@ _item_cache_free(Item_Cache *itc)
 }
 
 static void
+_icon_focused(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   Elm_Genlist_Item *it = data;
+   if (it) it->defer_unrealize = EINA_TRUE;
+}
+
+static void
+_icon_unfocused(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   Elm_Genlist_Item *it = data;
+   if (it) it->defer_unrealize = EINA_FALSE;
+}
+
+static void
 _item_realize(Elm_Genlist_Item *it,
               int               in,
               Eina_Bool         calc)
@@ -1920,6 +1935,10 @@ _item_realize(Elm_Genlist_Item *it,
                              edje_object_part_swallow(it->base.view, key, ic);
                              evas_object_show(ic);
                              elm_widget_sub_object_add(it->base.widget, ic);
+                             // FIXME: if entry calcuates its cursor position correctly and conformant works,
+                             //        genlist does not need to handle this focus thing.
+                             evas_object_smart_callback_add(ic, "focused", _icon_focused, it);
+                             evas_object_smart_callback_add(ic, "unfocused", _icon_unfocused, it);
                          }
                     }
               }
@@ -2018,6 +2037,7 @@ _item_unrealize(Elm_Genlist_Item *it,
 
    if (!it->realized) return;
    if (it->wd->reorder_it == it) return;
+   if (it->defer_unrealize) return;
    evas_event_freeze(evas_object_evas_get(it->wd->obj));
    if (!calc)
      evas_object_smart_callback_call(it->base.widget, SIG_UNREALIZED, it);
@@ -4491,6 +4511,7 @@ elm_genlist_item_update(Elm_Genlist_Item *it)
    it->block->updateme = EINA_TRUE;
    if (it->wd->update_job) ecore_job_del(it->wd->update_job);
    it->wd->update_job = ecore_job_add(_update_job, it->wd);
+   it->defer_unrealize = EINA_FALSE;
 }
 
 EAPI void

diff --git a/src/lib/elm_index.c b/src/lib/elm_index.c
index a05d48b..fcf9f1b 100644 (file)
--- a/src/lib/elm_index.c
+++ b/src/lib/elm_index.c
@@ -866,7 +866,13 @@ _index_process(Evas_Object *obj)
    if (extraIndex < 0) return;
 
    group_count = _group_count(obj, extraIndex, adj_pos, N);
-   if (group_count <= 0) return;
+   if (group_count <= 0)
+     {
+        if (indx)
+          free(indx);
+        indx = NULL;
+        return;
+     }
 
    PlacementPart place[adj_pos];
    remainder = extraIndex%group_count;
@@ -1090,6 +1096,8 @@ elm_index_item_append_relative(Evas_Object *obj, const char *letter, const void
         return;
      }
    it = _item_new(obj, letter, item);
+   if (!it) return;
+
    it_rel = _item_find(obj, relative);
    if (!it_rel)
      {
@@ -1097,7 +1105,7 @@ elm_index_item_append_relative(Evas_Object *obj, const char *letter, const void
         wd->tot_items_count[wd->level]++;
         return;
      }
-   if (!it) return;
+
    wd->items = eina_list_append_relative(wd->items, it, it_rel);
    wd->tot_items_count[wd->level]++;
    _index_box_clear(obj, wd->bx[wd->level], wd->level);
@@ -1127,6 +1135,8 @@ elm_index_item_prepend_relative(Evas_Object *obj, const char *letter, const void
         return;
      }
    it = _item_new(obj, letter, item);
+   if (!it) return;
+
    it_rel = _item_find(obj, relative);
    if (!it_rel)
      {
@@ -1134,7 +1144,7 @@ elm_index_item_prepend_relative(Evas_Object *obj, const char *letter, const void
         wd->tot_items_count[wd->level]++;
         return;
      }
-   if (!it) return;
+
    wd->items = eina_list_prepend_relative(wd->items, it, it_rel);
    wd->tot_items_count[wd->level]++;
    _index_box_clear(obj, wd->bx[wd->level], wd->level);

diff --git a/src/lib/elm_label.c b/src/lib/elm_label.c
index b0e5bee..afa8cd4 100644 (file)
--- a/src/lib/elm_label.c
+++ b/src/lib/elm_label.c
@@ -938,7 +938,6 @@ elm_label_background_color_set(Evas_Object *obj,
    if (!wd) return;
    evas_object_color_set(wd->bg, r, g, b, a);
 
-   if (!wd) return;
    _elm_dangerous_call_check(__FUNCTION__);
    if (wd->bgcolor == EINA_FALSE)
      {

diff --git a/src/lib/elm_searchbar.c b/src/lib/elm_searchbar.c
index 50f479a..5e73089 100644 (file)
--- a/src/lib/elm_searchbar.c
+++ b/src/lib/elm_searchbar.c
@@ -72,11 +72,17 @@ _on_focus_hook(void *data __UNUSED__, Evas_Object *obj)
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd || !wd->base)
       return;
-
-   if (elm_widget_focus_get(obj) && wd->cancel_btn_show_mode)
+   if (elm_widget_focus_get(obj))
      {
-        if (wd->cancel_btn_ani_flag) edje_object_signal_emit(wd->base, "CANCELIN", "PROG");
-        else edje_object_signal_emit(wd->base, "CANCELSHOW", "PROG");
+        /*FIXME: Sending clicked signal to focus editfield once open source is merged
+         * remove the below call
+         */
+        elm_object_signal_emit(wd->ef, "clicked", "elm");
+        if (wd->cancel_btn_show_mode)
+          {
+             if (wd->cancel_btn_ani_flag) edje_object_signal_emit(wd->base, "CANCELIN", "PROG");
+             else edje_object_signal_emit(wd->base, "CANCELSHOW", "PROG");
+          }
      }
    else
      {
@@ -201,7 +207,7 @@ EAPI Evas_Object *elm_searchbar_add(Evas_Object *parent)
    elm_object_style_set(wd->ef, "searchbar/default");
 
    edje_object_part_swallow(wd->base, "search_textfield", wd->ef);
-//   elm_editfield_guide_text_set(wd->ef, "Search");
+   elm_editfield_guide_text_set(wd->ef, E_("Search"));
    elm_editfield_entry_single_line_set(wd->ef, EINA_TRUE);
    elm_editfield_eraser_set(wd->ef, EINA_TRUE);
    evas_object_smart_callback_add(wd->ef, "clicked", _clicked, obj);

diff --git a/src/lib/elm_store.c b/src/lib/elm_store.c
index 25eb265..a2d5d38 100644 (file)
--- a/src/lib/elm_store.c
+++ b/src/lib/elm_store.c
@@ -1253,7 +1253,7 @@ _item_realized(void *data , Evas_Object *obj __UNUSED__, void *event_info)
    Elm_Store_Item *sti = elm_genlist_item_data_get(gli);
    if (!sti) return;
 
-   if (st->live && sti->item)
+   if (st->live)
      {
         if (!sti->data) _item_job_add(sti);
      }
@@ -1269,7 +1269,7 @@ _item_unrealized(void *data , Evas_Object *obj __UNUSED__, void *event_info)
    Elm_Store_Item *sti = elm_genlist_item_data_get(gli);
    if (!sti) return;
 
-   if (st->live && sti->item)
+   if (st->live)
      {
         if (sti->eval_job)
           {