Merge branch 'master' into elm_code

Makefile.am

@@ -52,7 +52,6 @@ EXTRA_DIST = \
 	autogen.sh \
 	config.rpath \
 	configure \
-	m4/efl_attribute.m4 \
 	m4/efl_binary.m4 \
 	m4/efl_compiler_flag.m4 \
 	m4/efl_path_max.m4

NEWS

@@ -1,7 +1,22 @@
 =========
-Edi 0.0.1
+Edi 0.0.2
 =========
 
+Features
+
+  * Add a settings screen to control various display features
+  * Support turning autosave on and off
+
+Bug fixes
+
+  * Fix issues with re-opening closed tabs
+  * Fix crash-on-open for some systems
+  * Fix username lookup for Windows
+
+
+0.0.1
+-----
+
 Features:
 
   * Editing and saving text files

elm_code/src/lib/elm_code_widget.c

@@ -35,7 +35,9 @@ Eina_Unicode status_icons[] = {
 
 #define EO_CONSTRUCTOR_CHECK_RETURN(obj) do { \
    Eina_Bool finalized; \
-   if (eo_do_ret(obj, finalized, eo_finalized_get())) \
+   \
+   eo_do(obj, finalized = eo_finalized_get()); \
+   if (finalized) \
      { \
         ERR("This function is only allowed during construction."); \
         return; \

src/bin/screens/edi_settings.c

@@ -9,7 +9,7 @@
 
 #include "edi_private.h"
 
-static Elm_Naviframe_Item *_edi_settings_display, *_edi_settings_behaviour;
+static Elm_Object_Item *_edi_settings_display, *_edi_settings_behaviour;
 
 static void
 _edi_settings_exit(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
@@ -20,9 +20,9 @@ _edi_settings_exit(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EI
 static void
 _edi_settings_category_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
-   Elm_Naviframe_Item *item;
+   Elm_Object_Item *item;
 
-   item = (Elm_Naviframe_Item *)data;
+   item = (Elm_Object_Item *)data;
    elm_naviframe_item_promote(item);
 }