diff -Nru ecrire-0.1.0~201309061201/AUTHORS ecrire-0.1.0~201401231349/AUTHORS
--- ecrire-0.1.0~201309061201/AUTHORS	2013-07-31 10:53:46.000000000 +0000
+++ ecrire-0.1.0~201401231349/AUTHORS	2014-01-03 17:10:04.000000000 +0000
@@ -1 +1,4 @@
 Tom Hacohen <tom@stosb.com>
+
+Ecrire icon:
+ApB (Apostolos B.)
diff -Nru ecrire-0.1.0~201309061201/data/ecrire.desktop ecrire-0.1.0~201401231349/data/ecrire.desktop
--- ecrire-0.1.0~201309061201/data/ecrire.desktop	2013-07-31 10:53:46.000000000 +0000
+++ ecrire-0.1.0~201401231349/data/ecrire.desktop	2014-01-03 17:10:04.000000000 +0000
@@ -2,24 +2,7 @@
 Encoding=UTF-8
 Type=Application
 Name=Ecrire
-Name[Name]=Ecrire
-Name[ab]=
-Name[ca]=
-Name[cs]=
-Name[de]=
-Name[el]=
-Name[eo]=
-Name[es]=
 Name[fr]=Écrire
-Name[gl]=
-Name[hu]=
-Name[it]=
-Name[ja]=
-Name[ko]=
-Name[pt]=
-Name[ru]=
-Name[sr]=
-Name[tr]=
 Comment=Simple text editor
 Comment[eo]=Simpla tekst-redaktilo
 Comment[es]=Un simple editor de texto
Binary files /tmp/y9v7smvW53/ecrire-0.1.0~201309061201/data/ecrire.png and /tmp/Zlt65294M9/ecrire-0.1.0~201401231349/data/ecrire.png differ
diff -Nru ecrire-0.1.0~201309061201/debian/changelog ecrire-0.1.0~201401231349/debian/changelog
--- ecrire-0.1.0~201309061201/debian/changelog	2013-09-06 08:01:09.000000000 +0000
+++ ecrire-0.1.0~201401231349/debian/changelog	2014-01-23 09:49:30.000000000 +0000
@@ -1,4 +1,4 @@
-ecrire (0.1.0~201309061201-1ppa1~quantal) quantal; urgency=high
+ecrire (0.1.0~201401231349-1ppa1~quantal) quantal; urgency=high
 
   * Autobuild.
 
diff -Nru ecrire-0.1.0~201309061201/po/LINGUAS ecrire-0.1.0~201401231349/po/LINGUAS
--- ecrire-0.1.0~201309061201/po/LINGUAS	2013-07-31 10:53:46.000000000 +0000
+++ ecrire-0.1.0~201401231349/po/LINGUAS	2014-01-03 17:10:04.000000000 +0000
@@ -1 +1 @@
-eo es fr gl he it ko_KR pt sr zh_CN
+eo es fr gl he hu it ko_KR pl pt sr zh_CN
diff -Nru ecrire-0.1.0~201309061201/po/POTFILES.in ecrire-0.1.0~201401231349/po/POTFILES.in
--- ecrire-0.1.0~201309061201/po/POTFILES.in	2013-07-31 10:53:46.000000000 +0000
+++ ecrire-0.1.0~201401231349/po/POTFILES.in	2014-01-03 17:10:04.000000000 +0000
@@ -1,6 +1,7 @@
 src/bin/file_utils.c
+src/bin/main.c
 src/bin/ui/alerts.c
 src/bin/ui/file_related.c
-src/bin/ui/search_dialog.c
 src/bin/ui/font_dialog.c
-src/bin/main.c
+src/bin/ui/goto_dialog.c
+src/bin/ui/search_dialog.c
diff -Nru ecrire-0.1.0~201309061201/po/hu.po ecrire-0.1.0~201401231349/po/hu.po
--- ecrire-0.1.0~201309061201/po/hu.po	1970-01-01 00:00:00.000000000 +0000
+++ ecrire-0.1.0~201401231349/po/hu.po	2014-01-03 17:10:04.000000000 +0000
@@ -0,0 +1,130 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Enlightenment development team
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ecrire\n"
+"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2013-03-18 01:19+0900\n"
+"PO-Revision-Date: 2013-12-25 15:53+0100\n"
+"Last-Translator: rezso <rezso@rezso.net>\n"
+"Language-Team: hu <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.5.5\n"
+"Language: hu\n"
+
+#: src/bin/ui/alerts.c:56
+msgid ""
+"<align=center>Would you like to save changes to document?<br>Any unsaved "
+"changes will be lost."
+msgstr ""
+"<align=center>Elmenti a dokumentum változásait?<br>Minden mentetlen változás "
+"elveszik."
+
+#: src/bin/ui/alerts.c:71 src/bin/main.c:687
+msgid "Save"
+msgstr "Mentés"
+
+#: src/bin/ui/alerts.c:82
+msgid "Discard"
+msgstr "Elvetés"
+
+#: src/bin/ui/alerts.c:88
+msgid "Cancel"
+msgstr "Mégsem"
+
+#: src/bin/ui/search_dialog.c:148 src/bin/main.c:705
+msgid "Find & Replace"
+msgstr "Keresés és csere"
+
+#: src/bin/ui/search_dialog.c:170
+msgid "Search for:"
+msgstr "Keresés erre: "
+
+#: src/bin/ui/search_dialog.c:194
+msgid "Replace with:"
+msgstr "Csere erre:"
+
+#: src/bin/ui/search_dialog.c:218
+msgid "Find"
+msgstr "Keresés"
+
+#: src/bin/ui/search_dialog.c:226
+msgid "Replace"
+msgstr "Csere"
+
+#: src/bin/ui/font_dialog.c:89
+msgid "Select Font"
+msgstr "Válasszon egy betűtípust"
+
+#: src/bin/ui/font_dialog.c:114
+msgid "Font size:"
+msgstr "Betűméret:"
+
+#: src/bin/ui/font_dialog.c:119
+#, c-format
+msgid "%.0f pts"
+msgstr "%.0f pont"
+
+#: src/bin/ui/font_dialog.c:157
+msgid "Use Default Font:"
+msgstr "Alapértelmezett betűkészlet használata:"
+
+#: src/bin/ui/font_dialog.c:168
+msgid "Set"
+msgstr "Beállítás"
+
+#: src/bin/main.c:96
+#, c-format
+msgid "%s%s - %s"
+msgstr "%s%s - %s"
+
+#: src/bin/main.c:99
+#, c-format
+msgid "%sUntitled %d - %s"
+msgstr "%sNévtelen %d - %s"
+
+#: src/bin/main.c:123
+#, c-format
+msgid "Ln %d, Col %d"
+msgstr "%d. sor, %d. oszlop"
+
+#: src/bin/main.c:684
+msgid "New"
+msgstr "Új"
+
+#: src/bin/main.c:685
+msgid "Open"
+msgstr "Megnyitás"
+
+#: src/bin/main.c:688
+msgid "Save As"
+msgstr "Mentés másként"
+
+#: src/bin/main.c:693
+msgid "Undo"
+msgstr "Mégse"
+
+#: src/bin/main.c:695
+msgid "Redo"
+msgstr "Újra"
+
+#: src/bin/main.c:698
+msgid "Cut"
+msgstr "Kivágás"
+
+#: src/bin/main.c:700
+msgid "Copy"
+msgstr "Másolás"
+
+#: src/bin/main.c:702
+msgid "Paste"
+msgstr "Beillesztés"
+
+#: src/bin/main.c:709
+msgid "Settings"
+msgstr "Beállítások"
diff -Nru ecrire-0.1.0~201309061201/po/it.po ecrire-0.1.0~201401231349/po/it.po
--- ecrire-0.1.0~201309061201/po/it.po	2013-07-31 10:53:46.000000000 +0000
+++ ecrire-0.1.0~201401231349/po/it.po	2014-01-03 17:10:04.000000000 +0000
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: ecrire\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-05-01 19:36+0200\n"
-"PO-Revision-Date: 2013-05-01 19:38+0200\n"
+"POT-Creation-Date: 2013-12-28 19:07+0100\n"
+"PO-Revision-Date: 2013-12-28 19:15+0100\n"
 "Last-Translator: Massimo Maiurana <maiurana@gmail.com>\n"
 "Language-Team: none\n"
 "Language: it\n"
@@ -15,67 +15,6 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/bin/ui/alerts.c:56
-msgid ""
-"<align=center>Would you like to save changes to document?<br>Any unsaved "
-"changes will be lost."
-msgstr ""
-"<align=center>Volete salvare le modifiche al documento?<br>Ogni modifica non "
-"salvata verrà persa."
-
-#: src/bin/ui/alerts.c:71 src/bin/main.c:694
-msgid "Save"
-msgstr "Salva"
-
-#: src/bin/ui/alerts.c:82
-msgid "Discard"
-msgstr "Abbandona"
-
-#: src/bin/ui/alerts.c:88
-msgid "Cancel"
-msgstr "Annulla"
-
-#: src/bin/ui/search_dialog.c:148 src/bin/main.c:712
-msgid "Find & Replace"
-msgstr "Trova & Sostituisci"
-
-#: src/bin/ui/search_dialog.c:170
-msgid "Search for:"
-msgstr "Cerca:"
-
-#: src/bin/ui/search_dialog.c:194
-msgid "Replace with:"
-msgstr "Sostituisci con: "
-
-#: src/bin/ui/search_dialog.c:218
-msgid "Find"
-msgstr "Trova"
-
-#: src/bin/ui/search_dialog.c:226
-msgid "Replace"
-msgstr "Sostituisci"
-
-#: src/bin/ui/font_dialog.c:89
-msgid "Select Font"
-msgstr "Seleziona carattere"
-
-#: src/bin/ui/font_dialog.c:114
-msgid "Font size:"
-msgstr "Dimensione carattere:"
-
-#: src/bin/ui/font_dialog.c:119
-#, c-format
-msgid "%.0f pts"
-msgstr "%.0f pt"
-
-#: src/bin/ui/font_dialog.c:157
-msgid "Use Default Font:"
-msgstr "Usa font predefinito:"
-
-#: src/bin/ui/font_dialog.c:168
-msgid "Set"
-msgstr "Set"
-
 #: src/bin/main.c:96
 #, c-format
 msgid "%s%s - %s"
@@ -99,6 +38,10 @@
 msgid "Open"
 msgstr "Apri"
 
+#: src/bin/main.c:694 src/bin/ui/alerts.c:71
+msgid "Save"
+msgstr "Salva"
+
 #: src/bin/main.c:695
 msgid "Save As"
 msgstr "Salva come"
@@ -123,6 +66,10 @@
 msgid "Paste"
 msgstr "Incolla"
 
+#: src/bin/main.c:712 src/bin/ui/search_dialog.c:148
+msgid "Find & Replace"
+msgstr "Trova & Sostituisci"
+
 #: src/bin/main.c:714
 msgid "Goto Line"
 msgstr "Vai alla riga"
@@ -130,3 +77,68 @@
 #: src/bin/main.c:717
 msgid "Settings"
 msgstr "Impostazioni"
+
+#: src/bin/ui/alerts.c:56
+msgid ""
+"<align=center>Would you like to save changes to document?<br>Any unsaved "
+"changes will be lost."
+msgstr ""
+"<align=center>Volete salvare le modifiche al documento?<br>Ogni modifica non "
+"salvata verrà persa."
+
+#: src/bin/ui/alerts.c:82
+msgid "Discard"
+msgstr "Abbandona"
+
+#: src/bin/ui/alerts.c:88
+msgid "Cancel"
+msgstr "Annulla"
+
+#: src/bin/ui/font_dialog.c:89
+msgid "Select Font"
+msgstr "Seleziona carattere"
+
+#: src/bin/ui/font_dialog.c:114
+msgid "Font size:"
+msgstr "Dimensione carattere:"
+
+#: src/bin/ui/font_dialog.c:119
+#, c-format
+msgid "%.0f pts"
+msgstr "%.0f pt"
+
+#: src/bin/ui/font_dialog.c:157
+msgid "Use Default Font:"
+msgstr "Usa font predefinito:"
+
+#: src/bin/ui/font_dialog.c:168
+msgid "Set"
+msgstr "Imposta"
+
+#: src/bin/ui/goto_dialog.c:60
+msgid "Go to"
+msgstr "Vai a"
+
+#: src/bin/ui/goto_dialog.c:82
+msgid "Go to line:"
+msgstr "Vai alla linea"
+
+#: src/bin/ui/goto_dialog.c:106
+msgid "Go"
+msgstr "Vai"
+
+#: src/bin/ui/search_dialog.c:170
+msgid "Search for:"
+msgstr "Cerca:"
+
+#: src/bin/ui/search_dialog.c:194
+msgid "Replace with:"
+msgstr "Sostituisci con: "
+
+#: src/bin/ui/search_dialog.c:218
+msgid "Find"
+msgstr "Trova"
+
+#: src/bin/ui/search_dialog.c:226
+msgid "Replace"
+msgstr "Sostituisci"
diff -Nru ecrire-0.1.0~201309061201/po/pl.po ecrire-0.1.0~201401231349/po/pl.po
--- ecrire-0.1.0~201309061201/po/pl.po	1970-01-01 00:00:00.000000000 +0000
+++ ecrire-0.1.0~201401231349/po/pl.po	2014-01-03 17:10:04.000000000 +0000
@@ -0,0 +1,135 @@
+# Polish translation for Ecrire.
+# This file is put in the public domain.
+# Konrad Makowski <poczta@konradmakowski.pl>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Ecrire\n"
+"Report-Msgid-Bugs-To: $MSGID_BUGS_ADDRESS\n"
+"POT-Creation-Date: 2013-04-07 20:53+0200\n"
+"PO-Revision-Date: 2013-11-22 22:59+0100\n"
+"Last-Translator: Konrad Makowski\n"
+"Language-Team: polish <poczta@konradmakowski.pl>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-05-30 05:53+0000\n"
+"X-Generator: Launchpad (build 16652)\n"
+"X-Poedit-Country: Polski\n"
+"Language: pl\n"
+"X-Poedit-Language: Polish\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#: src/bin/ui/alerts.c:56
+msgid ""
+"<align=center>Would you like to save changes to document?<br>Any unsaved "
+"changes will be lost."
+msgstr "<align=center>Czy chcesz zapisać zmiany w dokumencie?<br>Wszelkie nie zapisane zmiany zostaną utracone."
+
+#: src/bin/ui/alerts.c:71 src/bin/main.c:694
+msgid "Save"
+msgstr "Zapisz"
+
+#: src/bin/ui/alerts.c:82
+msgid "Discard"
+msgstr "Zaniechaj"
+
+#: src/bin/ui/alerts.c:88
+msgid "Cancel"
+msgstr "Anuluj"
+
+#: src/bin/ui/search_dialog.c:148 src/bin/main.c:712
+msgid "Find & Replace"
+msgstr "Znajdź i zamień"
+
+#: src/bin/ui/search_dialog.c:170
+msgid "Search for:"
+msgstr "Szukaj:"
+
+#: src/bin/ui/search_dialog.c:194
+msgid "Replace with:"
+msgstr "Zamień przez:"
+
+#: src/bin/ui/search_dialog.c:218
+msgid "Find"
+msgstr "Znajdź"
+
+#: src/bin/ui/search_dialog.c:226
+msgid "Replace"
+msgstr "Zamień"
+
+#: src/bin/ui/font_dialog.c:89
+msgid "Select Font"
+msgstr "Wybierz Font"
+
+#: src/bin/ui/font_dialog.c:114
+msgid "Font size:"
+msgstr "Wielkość Fontu:"
+
+#: src/bin/ui/font_dialog.c:119
+#, c-format
+msgid "%.0f pts"
+msgstr "%.0f pkt"
+
+#: src/bin/ui/font_dialog.c:157
+msgid "Use Default Font:"
+msgstr "Użyj Domyślnego Fontu:"
+
+#: src/bin/ui/font_dialog.c:168
+msgid "Set"
+msgstr "Ustaw"
+
+#: src/bin/main.c:96
+#, c-format
+msgid "%s%s - %s"
+msgstr "%s%s - %s"
+
+#: src/bin/main.c:99
+#, c-format
+msgid "%sUntitled %d - %s"
+msgstr "%sBez tytułu %d - %s"
+
+#: src/bin/main.c:123
+#, c-format
+msgid "Ln %d, Col %d"
+msgstr "Wiersz %d, Kolumna %d"
+
+#: src/bin/main.c:691
+msgid "New"
+msgstr "Nowy"
+
+#: src/bin/main.c:692
+msgid "Open"
+msgstr "Otwórz"
+
+#: src/bin/main.c:695
+msgid "Save As"
+msgstr "Zapisz jako"
+
+#: src/bin/main.c:700
+msgid "Undo"
+msgstr "Cofnij"
+
+#: src/bin/main.c:702
+msgid "Redo"
+msgstr "Ponów"
+
+#: src/bin/main.c:705
+msgid "Cut"
+msgstr "Wytnij"
+
+#: src/bin/main.c:707
+msgid "Copy"
+msgstr "Kopiuj"
+
+#: src/bin/main.c:709
+msgid "Paste"
+msgstr "Wklej"
+
+#: src/bin/main.c:714
+msgid "Goto Line"
+msgstr "Idź do linii"
+
+#: src/bin/main.c:717
+msgid "Settings"
+msgstr "Ustawienia"
diff -Nru ecrire-0.1.0~201309061201/po/sr.po ecrire-0.1.0~201401231349/po/sr.po
--- ecrire-0.1.0~201309061201/po/sr.po	2013-07-31 10:53:46.000000000 +0000
+++ ecrire-0.1.0~201401231349/po/sr.po	2014-01-03 17:10:04.000000000 +0000
@@ -5,78 +5,17 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: $MSGID_BUGS_ADDRESS\n"
-"POT-Creation-Date: 2013-04-07 20:53+0200\n"
+"POT-Creation-Date: 2013-12-30 11:50+0100\n"
 "PO-Revision-Date: 2013-04-11 16:30+0000\n"
 "Last-Translator: Саша Петровић <salepetronije@gmail.com>\n"
 "Language-Team: српски <xfce-i18n@xfce.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-04-12 05:22+0000\n"
-"X-Generator: Launchpad (build 16564)\n"
+"X-Launchpad-Export-Date: 2013-12-31 04:55+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
-#: src/bin/ui/alerts.c:56
-msgid ""
-"<align=center>Would you like to save changes to document?<br>Any unsaved "
-"changes will be lost."
-msgstr ""
-"<align=center>Да ли желите да сачувате измене у документу?<br>Несачуване "
-"измене ће бити изгубљине."
-
-#: src/bin/ui/alerts.c:71 src/bin/main.c:694
-msgid "Save"
-msgstr "Сачувај"
-
-#: src/bin/ui/alerts.c:82
-msgid "Discard"
-msgstr "Одбаци"
-
-#: src/bin/ui/alerts.c:88
-msgid "Cancel"
-msgstr "Откажи"
-
-#: src/bin/ui/search_dialog.c:148 src/bin/main.c:712
-msgid "Find & Replace"
-msgstr "Нађи и замени"
-
-#: src/bin/ui/search_dialog.c:170
-msgid "Search for:"
-msgstr "Тражи:"
-
-#: src/bin/ui/search_dialog.c:194
-msgid "Replace with:"
-msgstr "Замени са:"
-
-#: src/bin/ui/search_dialog.c:218
-msgid "Find"
-msgstr "Нађи"
-
-#: src/bin/ui/search_dialog.c:226
-msgid "Replace"
-msgstr "Замени"
-
-#: src/bin/ui/font_dialog.c:89
-msgid "Select Font"
-msgstr "Одаберите словни лик"
-
-#: src/bin/ui/font_dialog.c:114
-msgid "Font size:"
-msgstr "Величина словонг лика:"
-
-#: src/bin/ui/font_dialog.c:119
-#, c-format
-msgid "%.0f pts"
-msgstr "%.0f тачака"
-
-#: src/bin/ui/font_dialog.c:157
-msgid "Use Default Font:"
-msgstr "Користи задати словни лик:"
-
-#: src/bin/ui/font_dialog.c:168
-msgid "Set"
-msgstr "Постави"
-
 #: src/bin/main.c:96
 #, c-format
 msgid "%s%s - %s"
@@ -100,6 +39,10 @@
 msgid "Open"
 msgstr "Отвори"
 
+#: src/bin/main.c:694 src/bin/ui/alerts.c:71
+msgid "Save"
+msgstr "Сачувај"
+
 #: src/bin/main.c:695
 msgid "Save As"
 msgstr "Сачувај као"
@@ -124,6 +67,10 @@
 msgid "Paste"
 msgstr "Налепи"
 
+#: src/bin/main.c:712 src/bin/ui/search_dialog.c:148
+msgid "Find & Replace"
+msgstr "Нађи и замени"
+
 #: src/bin/main.c:714
 msgid "Goto Line"
 msgstr "Иди на линију"
@@ -131,3 +78,68 @@
 #: src/bin/main.c:717
 msgid "Settings"
 msgstr "Поставке"
+
+#: src/bin/ui/alerts.c:56
+msgid ""
+"<align=center>Would you like to save changes to document?<br>Any unsaved "
+"changes will be lost."
+msgstr ""
+"<align=center>Да ли желите да сачувате измене у документу?<br>Несачуване "
+"измене ће бити изгубљине."
+
+#: src/bin/ui/alerts.c:82
+msgid "Discard"
+msgstr "Одбаци"
+
+#: src/bin/ui/alerts.c:88
+msgid "Cancel"
+msgstr "Откажи"
+
+#: src/bin/ui/font_dialog.c:89
+msgid "Select Font"
+msgstr "Одаберите словни лик"
+
+#: src/bin/ui/font_dialog.c:114
+msgid "Font size:"
+msgstr "Величина словонг лика:"
+
+#: src/bin/ui/font_dialog.c:119
+#, c-format
+msgid "%.0f pts"
+msgstr "%.0f тачака"
+
+#: src/bin/ui/font_dialog.c:157
+msgid "Use Default Font:"
+msgstr "Користи задати словни лик:"
+
+#: src/bin/ui/font_dialog.c:168
+msgid "Set"
+msgstr "Постави"
+
+#: src/bin/ui/goto_dialog.c:60
+msgid "Go to"
+msgstr ""
+
+#: src/bin/ui/goto_dialog.c:82
+msgid "Go to line:"
+msgstr ""
+
+#: src/bin/ui/goto_dialog.c:106
+msgid "Go"
+msgstr ""
+
+#: src/bin/ui/search_dialog.c:170
+msgid "Search for:"
+msgstr "Тражи:"
+
+#: src/bin/ui/search_dialog.c:194
+msgid "Replace with:"
+msgstr "Замени са:"
+
+#: src/bin/ui/search_dialog.c:218
+msgid "Find"
+msgstr "Нађи"
+
+#: src/bin/ui/search_dialog.c:226
+msgid "Replace"
+msgstr "Замени"
diff -Nru ecrire-0.1.0~201309061201/src/bin/cfg.c ecrire-0.1.0~201401231349/src/bin/cfg.c
--- ecrire-0.1.0~201309061201/src/bin/cfg.c	2013-07-31 10:53:46.000000000 +0000
+++ ecrire-0.1.0~201401231349/src/bin/cfg.c	2014-01-03 17:10:04.000000000 +0000
@@ -43,15 +43,23 @@
       free(config_file);
 
    _ent_cfg_descriptor_shutdown();
+
+   eet_shutdown();
+   efreet_shutdown();
 }
 
 void
 ecrire_cfg_init(const char *file)
 {
    const char *ext = ".cfg";
-   const char *path = efreet_config_home_get();
+   const char *path;
    size_t len;
 
+   efreet_init();
+   eet_init();
+
+   path = efreet_config_home_get();
+
    if (!path || !file)
       return;
 
@@ -63,8 +71,6 @@
    config_file = malloc(len + 1);
    snprintf(config_file, len + 1, "%s/%s%s", path, file, ext);
 
-   eet_init();
-
    _ent_cfg_descriptor_init();
 }
 
@@ -86,7 +92,7 @@
    Eet_File *ef;
 
    if (!config_file)
-      return EINA_FALSE;
+      goto end;
 
    ef = eet_open(config_file, EET_FILE_MODE_READ);
    if (!ef)
@@ -96,8 +102,6 @@
      }
 
    _ent_cfg = eet_data_read(ef, _ent_cfg_descriptor, _CONFIG_ENTRY);
-   if (!_ent_cfg)
-      goto end;
 
 end:
    if (!_ent_cfg)
diff -Nru ecrire-0.1.0~201309061201/src/bin/ui/alerts.c ecrire-0.1.0~201401231349/src/bin/ui/alerts.c
--- ecrire-0.1.0~201309061201/src/bin/ui/alerts.c	2013-07-31 10:53:46.000000000 +0000
+++ ecrire-0.1.0~201401231349/src/bin/ui/alerts.c	2014-01-03 17:10:04.000000000 +0000
@@ -38,20 +38,20 @@
 ui_alert_need_saving(Evas_Object *entry, void (*done)(void *data), void *data)
 {
    Ecrire_Entry *ent = data;
-   Evas_Object *inwin, *bx, *hbx, *btn, *lbl;
-   inwin = elm_win_inwin_add(elm_object_top_widget_get(entry));
-   evas_object_show(inwin);
+   Evas_Object *popup, *bx, *hbx, *btn, *lbl;
+   popup = elm_popup_add(elm_object_top_widget_get(entry));
+   evas_object_show(popup);
 
    done_cb = done;
    done_data = data;
 
-   bx = elm_box_add(inwin);
-   elm_win_inwin_content_set(inwin, bx);
+   bx = elm_box_add(popup);
+   elm_object_content_set(popup, bx);
    evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, 0.0);
    evas_object_show(bx);
 
-   lbl = elm_label_add(inwin);
+   lbl = elm_label_add(popup);
    elm_object_text_set(lbl,
          _("<align=center>Would you like to save changes to document?<br>"
          "Any unsaved changes will be lost."));
@@ -60,33 +60,33 @@
    elm_box_pack_end(bx, lbl);
    evas_object_show(lbl);
 
-   hbx = elm_box_add(inwin);
+   hbx = elm_box_add(popup);
    elm_box_horizontal_set(hbx, EINA_TRUE);
    evas_object_size_hint_weight_set(hbx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(hbx, EVAS_HINT_FILL, 0.0);
    elm_box_pack_end(bx, hbx);
    evas_object_show(hbx);
 
-   btn = elm_button_add(inwin);
+   btn = elm_button_add(popup);
    elm_object_text_set(btn, _("Save"));
    elm_box_pack_end(hbx, btn);
    evas_object_show(btn);
-   evas_object_smart_callback_add(btn, "clicked", _save, inwin);
+   evas_object_smart_callback_add(btn, "clicked", _save, popup);
 
    if (elm_object_item_disabled_get(ent->save_item) || !ent->filename)
      {
         elm_object_disabled_set(btn, EINA_TRUE);
      }
 
-   btn = elm_button_add(inwin);
+   btn = elm_button_add(popup);
    elm_object_text_set(btn, _("Discard"));
    elm_box_pack_end(hbx, btn);
    evas_object_show(btn);
-   evas_object_smart_callback_add(btn, "clicked", _discard, inwin);
+   evas_object_smart_callback_add(btn, "clicked", _discard, popup);
 
-   btn = elm_button_add(inwin);
+   btn = elm_button_add(popup);
    elm_object_text_set(btn, _("Cancel"));
    elm_box_pack_end(hbx, btn);
    evas_object_show(btn);
-   evas_object_smart_callback_add(btn, "clicked", _cancel, inwin);
+   evas_object_smart_callback_add(btn, "clicked", _cancel, popup);
 }