Merge branch 'master' into elm_code

Conflicts:
	elm_code/lib/elm_code_widget.c

elm_code/lib/Elm_Code.h

@@ -4,6 +4,8 @@
 #include <Eina.h>
 #include <Eo.h>
 #include <Elementary.h>
+#define ELM_INTERNAL_API_ARGESFSDFEFC
+#include <elm_widget.h>
 
 #ifdef EAPI
 # undef EAPI

elm_code/lib/elm_code_widget.c

@@ -2,14 +2,7 @@
 # include "config.h"
 #endif
 
-#include <Eo.h>
-#include <Evas.h>
-#include <Elementary.h>
-#define ELM_INTERNAL_API_ARGESFSDFEFC
-#include <elm_widget.h>
-
 #include <Elm_Code.h>
-#include "elm_code_widget.eo.h"
 #include "elm_code_private.h"
 
 typedef struct
@@ -458,6 +451,12 @@ _elm_code_widget_event_veto_cb(void *data, Evas_Object *obj EINA_UNUSED,
    widget = (Elm_Code_Widget *)data;
    pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
 
+   if (!pd->editable)
+     return EINA_FALSE;
+
+   widget = (Elm_Code_Widget *)data;
+   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+
    if (!pd->editable)
      return EINA_FALSE;
 

src/bin/Makefile.am

@@ -3,8 +3,9 @@ AUTOMAKE_OPTIONS = subdir-objects
 
 bin_PROGRAMS = edi edi_build
 
-AM_CPPFLAGS = -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
+AM_CPPFLAGS = \
--I$(top_builddir)/src/bin/ \
+-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
+-DLOCALEDIR=\"$(datadir)/locale\" \
 -I$(top_srcdir)/src/bin/ \
 -I$(top_srcdir)/elm_code/lib \
 -I$(top_builddir)/src/lib/ \
@@ -22,7 +23,8 @@ edi_logpanel.c \
 edi_consolepanel.c \
 mainview/edi_mainview_item.c \
 mainview/edi_mainview.c \
-edi_main.c
+edi_main.c \
+edi_private.h
 
 edi_LDADD = @EFL_LIBS@ $(top_builddir)/elm_code/lib/libelm_code.la $(top_builddir)/src/lib/libedi.la
 
@@ -31,8 +33,3 @@ edi_build_main.c
 
 edi_build_LDADD = @EFL_LIBS@ $(top_builddir)/src/lib/libedi.la
 
-localedir = $(datadir)/locale
-DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
-
-EXTRA_DIST = edi_private.h
-

src/bin/edi_consolepanel.c

@@ -168,17 +168,17 @@ static void _edi_consolepanel_append_line_type(const char *line, Eina_Bool err)
    _edi_test_line_callback(line);
 }
 
-EAPI void edi_consolepanel_append_line(const char *line)
+void edi_consolepanel_append_line(const char *line)
 {
    _edi_consolepanel_append_line_type(line, EINA_FALSE);
 }
 
-EAPI void edi_consolepanel_append_error_line(const char *line)
+void edi_consolepanel_append_error_line(const char *line)
 {
    _edi_consolepanel_append_line_type(line, EINA_TRUE);
 }
 
-EAPI void edi_consolepanel_clear()
+void edi_consolepanel_clear()
 {
    elm_box_clear(_console_box);
 
@@ -311,7 +311,7 @@ static void _edi_test_line_callback(const char *content)
      }
 }
 
-EAPI void edi_consolepanel_add(Evas_Object *parent)
+void edi_consolepanel_add(Evas_Object *parent)
 {
    Evas_Object *scroll, *vbx;
 
@@ -333,7 +333,7 @@ EAPI void edi_consolepanel_add(Evas_Object *parent)
    ecore_event_handler_add(ECORE_EXE_EVENT_ERROR, _exe_error, NULL);
 }
 
-EAPI void edi_testpanel_add(Evas_Object *parent)
+void edi_testpanel_add(Evas_Object *parent)
 {
    Elm_Code *code;
    Elm_Code_Widget *widget;

src/bin/edi_consolepanel.h

@@ -29,18 +29,18 @@ extern "C" {
  *
  * @ingroup UI
  */
-EAPI void edi_consolepanel_add(Evas_Object *parent);
+void edi_consolepanel_add(Evas_Object *parent);
 
 /**
  * Show the Edi consolepanel - animating on to screen if required.
  *
  * @ingroup UI
  */
-EAPI void edi_consolepanel_show();
+void edi_consolepanel_show();
 
-EAPI void edi_testpanel_add(Evas_Object *parent);
+void edi_testpanel_add(Evas_Object *parent);
 
-EAPI void edi_testpanel_show();
+void edi_testpanel_show();
 
 /**
  * @}
@@ -61,7 +61,7 @@ EAPI void edi_testpanel_show();
  *
  * @ingroup Console
  */
-EAPI void edi_consolepanel_append_line(const char *line);
+void edi_consolepanel_append_line(const char *line);
 
 /**
  * Append a new error line to the console.
@@ -70,14 +70,14 @@ EAPI void edi_consolepanel_append_line(const char *line);
  *
  * @ingroup Console
  */
-EAPI void edi_consolepanel_append_error_line(const char *line);
+void edi_consolepanel_append_error_line(const char *line);
 
 /**
  * Clear all lines from the console.
  *
  * @ingroup Console
  */
-EAPI void edi_consolepanel_clear();
+void edi_consolepanel_clear();
 
 /**
  * @}

src/bin/edi_content_provider.c

@@ -54,10 +54,13 @@ static Edi_Content_Provider _edi_content_provider_registry[] =
    {NULL, EINA_FALSE, EINA_FALSE, NULL}
 };
 
-EAPI Edi_Content_Provider *edi_content_provider_for_mime_get(const char *mime)
+Edi_Content_Provider *edi_content_provider_for_mime_get(const char *mime)
 {
    char *id;
 
+   if (!mime)
+     return NULL;
+
    if (!strcasecmp(mime, "text/plain") || !strcasecmp(mime, "application/x-shellscript"))
      id = "text";
    else if (!strcasecmp(mime, "text/x-chdr") || !strcasecmp(mime, "text/x-csrc")
@@ -73,7 +76,7 @@ EAPI Edi_Content_Provider *edi_content_provider_for_mime_get(const char *mime)
    return edi_content_provider_for_id_get(id);
 }
 
-EAPI Edi_Content_Provider *edi_content_provider_for_id_get(const char *id)
+Edi_Content_Provider *edi_content_provider_for_id_get(const char *id)
 {
    Edi_Content_Provider *provider;
 

src/bin/edi_content_provider.h

@@ -43,7 +43,7 @@ typedef struct _Edi_Content_Provider
  *
  * @ingroup Lookup
  */
-EAPI Edi_Content_Provider *edi_content_provider_for_mime_get(const char *mime);
+Edi_Content_Provider *edi_content_provider_for_mime_get(const char *mime);
 
 /**
  * Look up a content provider based on a provider id.
@@ -55,7 +55,7 @@ EAPI Edi_Content_Provider *edi_content_provider_for_mime_get(const char *mime);
  *
  * @ingroup Lookup
  */
-EAPI Edi_Content_Provider *edi_content_provider_for_id_get(const char *id);
+Edi_Content_Provider *edi_content_provider_for_id_get(const char *id);
 
 /**
  * @}

src/bin/edi_filepanel.c

@@ -46,13 +46,16 @@ static void
 _item_menu_xdgopen_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
                       void *event_info EINA_UNUSED)
 {
-   int pid = fork();
+   char *cmd;
+   int cmdlen;
+   const char *format = "xdg-open \"%s\"";
 
-   if (pid == 0)
+   cmdlen = strlen(format) + strlen(_menu_cb_path) - 1;
-     {
+   cmd = malloc(sizeof(char) * cmdlen);
-        execlp("/usr/bin/xdg-open", "xdg-open", _menu_cb_path, NULL);
+   snprintf(cmd, cmdlen, format, _menu_cb_path);
-        exit(0);
+
-     }
+   ecore_exe_run(cmd, NULL);
+   free(cmd);
 }
 
 static void

src/bin/edi_logpanel.c

@@ -38,7 +38,7 @@ static void _print_cb(const Eina_Log_Domain *domain,
      }
 }
 
-EAPI void edi_logpanel_add(Evas_Object *parent)
+void edi_logpanel_add(Evas_Object *parent)
 {
    Elm_Code_Widget *widget;
    Elm_Code *code;

src/bin/edi_main.c

@@ -282,14 +282,14 @@ _edi_panel_dragged_cb(void *data, Evas_Object *obj EINA_UNUSED,
    _edi_panel_size_save(data == _edi_filepanel);
 }
 
-EAPI void
+void
 edi_consolepanel_show()
 {
    if (_edi_selected_bottompanel != _edi_consolepanel_item)
      elm_toolbar_item_selected_set(_edi_consolepanel_item, EINA_TRUE);
 }
 
-EAPI void
+void
 edi_testpanel_show()
 {
    if (_edi_selected_bottompanel != _edi_testpanel_item)
@@ -447,7 +447,7 @@ _tb_new_create_cb(void *data,
    path = edi_project_file_path_get(name);
 
    fclose(fopen(path, "w"));
-   edi_mainview_open_path(path);
+   edi_mainview_open_path(eina_stringshare_add(path));
 
    evas_object_del(_edi_new_popup);
    free((char*)path);
@@ -718,7 +718,7 @@ _edi_resize_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj,
    _edi_config_save();
 }
 
-EAPI Evas_Object *
+Evas_Object *
 edi_open(const char *inputpath)
 {
    Evas_Object *win, *vbx, *content, *tb;
@@ -769,7 +769,7 @@ edi_open(const char *inputpath)
    return win;
 }
 
-EAPI void
+void
 edi_close()
 {
    elm_exit();

src/bin/edi_private.h

@@ -28,8 +28,8 @@ extern int _edi_log_dom;
 
 #define EDI_CONTENT_AUTOSAVE EINA_TRUE
 
-EAPI Evas_Object *edi_open(const char *path);
+Evas_Object *edi_open(const char *path);
 
-EAPI void edi_close();
+void edi_close();
 
 #endif

src/bin/editor/edi_editor.c

@@ -695,7 +695,7 @@ _text_set_done(void *data, Evas_Object *obj EINA_UNUSED, void *source EINA_UNUSE
    _reset_highlight(editor);
 }
 
-EAPI Evas_Object *_edi_editor_add(Evas_Object *parent, Edi_Mainview_Item *item)
+Evas_Object *_edi_editor_add(Evas_Object *parent, Edi_Mainview_Item *item)
 {
    Evas_Object *txt, *lines, *vbox, *box, *searchbar, *statusbar;
    Evas_Modifier_Mask ctrl, shift, alt;

src/bin/editor/edi_editor.h

@@ -75,7 +75,7 @@ struct _Edi_Editor
  *
  * @ingroup Editor
  */
-EAPI Evas_Object *_edi_editor_add(Evas_Object *parent, Edi_Mainview_Item *item);
+Evas_Object *_edi_editor_add(Evas_Object *parent, Edi_Mainview_Item *item);
 
 /**
  * @}
@@ -95,7 +95,7 @@ EAPI Evas_Object *_edi_editor_add(Evas_Object *parent, Edi_Mainview_Item *item);
  *
  * @ingroup Widgets
  */
-EAPI void _edi_editor_search_add(Evas_Object *parent, Edi_Editor *editor);
+void _edi_editor_search_add(Evas_Object *parent, Edi_Editor *editor);
 
 /**
  * Start a search in the specified editor.
@@ -104,7 +104,7 @@ EAPI void _edi_editor_search_add(Evas_Object *parent, Edi_Editor *editor);
  *
  * @ingroup Widgets
  */
-EAPI void _edi_editor_search(Edi_Editor *editor);
+void _edi_editor_search(Edi_Editor *editor);
 
 /**
  * @}

src/bin/editor/edi_editor_search.c

@@ -187,7 +187,7 @@ _edi_editor_search_hide(Edi_Editor *editor)
    elm_object_focus_set(editor->entry, EINA_TRUE);
 }
 
-EAPI void
+void
 _edi_editor_search(Edi_Editor *editor)
 {
    Edi_Editor_Search *search;
@@ -269,7 +269,7 @@ _edi_search_key_up_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
      }
 }
 
-EAPI void
+void
 _edi_editor_search_add(Evas_Object *parent, Edi_Editor *editor)
 {
    Evas_Object *entry, *lbl, *btn, *box, *big_box;

src/bin/mainview/edi_mainview.c

@@ -26,7 +26,7 @@ static void
 dummy()
 {}
 
-EAPI Edi_Mainview_Item *
+Edi_Mainview_Item *
 edi_mainview_item_current_get()
 {
    Eina_List *item;
@@ -46,7 +46,7 @@ edi_mainview_item_current_get()
    return NULL;
 }
 
-EAPI void
+void
 edi_mainview_item_prev()
 {
    Eina_List *item;
@@ -68,7 +68,7 @@ edi_mainview_item_prev()
      }
 }
 
-EAPI void
+void
 edi_mainview_item_next()
 {
    Eina_List *item;
@@ -91,7 +91,7 @@ edi_mainview_item_next()
      }
 }
 
-EAPI void
+void
 edi_mainview_item_select(Edi_Mainview_Item *item)
 {
    if (item->win)
@@ -331,7 +331,7 @@ _edi_mainview_win_stat_done(void *data, Eio_File *handler EINA_UNUSED, const Ein
    _edi_mainview_item_win_add(options, mime);
 }
 
-EAPI void
+void
 edi_mainview_open_path(const char *path)
 {
    Edi_Path_Options *options;
@@ -349,7 +349,7 @@ edi_mainview_open_path(const char *path)
    eio_file_direct_stat(path, _edi_mainview_tab_stat_done, dummy, options);
 }
 
-EAPI void
+void
 edi_mainview_open(Edi_Path_Options *options)
 {
    Edi_Mainview_Item *it;
@@ -373,7 +373,7 @@ edi_mainview_open(Edi_Path_Options *options)
      }
 }
 
-EAPI void
+void
 edi_mainview_open_window_path(const char *path)
 {
    Edi_Path_Options *options;
@@ -394,7 +394,7 @@ edi_mainview_open_window_path(const char *path)
    eio_file_direct_stat(path, _edi_mainview_win_stat_done, dummy, options);
 }
 
-EAPI void
+void
 edi_mainview_open_window(Edi_Path_Options *options)
 {
    Edi_Mainview_Item *it;
@@ -419,7 +419,7 @@ edi_mainview_open_window(Edi_Path_Options *options)
      }
 }
 
-EAPI void
+void
 edi_mainview_save()
 {
    Evas_Object *content;
@@ -434,7 +434,7 @@ edi_mainview_save()
      elm_entry_file_save(editor->entry);
 }
 
-EAPI void
+void
 edi_mainview_new_window()
 {
    Edi_Mainview_Item *item;
@@ -446,7 +446,7 @@ edi_mainview_new_window()
    edi_mainview_open_window_path(item->path);
 }
 
-EAPI void
+void
 edi_mainview_close()
 {
    Edi_Mainview_Item *item;
@@ -462,7 +462,7 @@ edi_mainview_close()
    free(item);
 }
 
-EAPI void
+void
 edi_mainview_cut()
 {
    Evas_Object *content;
@@ -477,7 +477,7 @@ edi_mainview_cut()
      elm_entry_selection_cut(editor->entry);
 }
 
-EAPI void
+void
 edi_mainview_copy()
 {
    Evas_Object *content;
@@ -492,7 +492,7 @@ edi_mainview_copy()
      elm_entry_selection_copy(editor->entry);
 }
 
-EAPI void
+void
 edi_mainview_paste()
 {
    Evas_Object *content;
@@ -507,7 +507,7 @@ edi_mainview_paste()
      elm_entry_selection_paste(editor->entry);
 }
 
-EAPI void
+void
 edi_mainview_search()
 {
    Evas_Object *content;
@@ -522,7 +522,7 @@ edi_mainview_search()
      _edi_editor_search(editor);
 }
 
-EAPI void
+void
 edi_mainview_goto(int line)
 {
    Evas_Object *content;
@@ -549,7 +549,7 @@ edi_mainview_goto(int line)
    elm_object_focus_set(editor->entry, EINA_TRUE);
 }
 
-EAPI void
+void
 edi_mainview_add(Evas_Object *parent, Evas_Object *win)
 {
    Evas_Object *box, *txt;

src/bin/mainview/edi_mainview.h

@@ -35,7 +35,7 @@ extern "C" {
  *
  * @ingroup UI
  */
-EAPI void edi_mainview_add(Evas_Object *parent, Evas_Object *win);
+void edi_mainview_add(Evas_Object *parent, Evas_Object *win);
 
 /**
  * @}
@@ -58,7 +58,7 @@ EAPI void edi_mainview_add(Evas_Object *parent, Evas_Object *win);
  *
  * @ingroup Content
  */
-EAPI void edi_mainview_open_path(const char *path);
+void edi_mainview_open_path(const char *path);
 
 /**
  * Open the file described in the provided options - path and location etc.
@@ -67,7 +67,7 @@ EAPI void edi_mainview_open_path(const char *path);
  *
  * @ingroup Content
  */
-EAPI void edi_mainview_open(Edi_Path_Options *options);
+void edi_mainview_open(Edi_Path_Options *options);
 
 /**
  * Open the file at path for editing in a new window using the type specified.
@@ -78,7 +78,7 @@ EAPI void edi_mainview_open(Edi_Path_Options *options);
  *
  * @ingroup Content
  */
-EAPI void edi_mainview_open_window_path(const char *path);
+void edi_mainview_open_window_path(const char *path);
 
 /**
  * Open the file described in the provided options in a new window - path and location etc.
@@ -87,7 +87,7 @@ EAPI void edi_mainview_open_window_path(const char *path);
  *
  * @ingroup Content
  */
-EAPI void edi_mainview_open_window(Edi_Path_Options *options);
+void edi_mainview_open_window(Edi_Path_Options *options);
 
 
 /**
@@ -95,49 +95,49 @@ EAPI void edi_mainview_open_window(Edi_Path_Options *options);
  *
  * @ingroup Content
  */
-EAPI void edi_mainview_save();
+void edi_mainview_save();
 
 /**
  * Move the current tab to a new window.
  *
  * @ingroup Content
  */
-EAPI void edi_mainview_new_window();
+void edi_mainview_new_window();
 
 /**
  * Close the current file.
  *
  * @ingroup Content
  */
-EAPI void edi_mainview_close();
+void edi_mainview_close();
 
 /**
  * Cut the current selection into the clipboard.
  *
  * @ingroup Content
  */
-EAPI void edi_mainview_cut();
+void edi_mainview_cut();
 
 /**
  * Copy the current selection into the clipboard.
  *
  * @ingroup Content
  */
-EAPI void edi_mainview_copy();
+void edi_mainview_copy();
 
 /**
  * Paste the current clipboard contents at the current cursor position.
  *
  * @ingroup Content
  */
-EAPI void edi_mainview_paste();
+void edi_mainview_paste();
 
 /**
  * Search the current view's contents.
  *
  * @ingroup Content
  */
-EAPI void edi_mainview_search();
+void edi_mainview_search();
 
 /**
  * Go to a requested line in the current view's contents.
@@ -146,7 +146,7 @@ EAPI void edi_mainview_search();
  *
  * @ingroup Content
  */
-EAPI void edi_mainview_goto(int line);
+void edi_mainview_goto(int line);
 
 /**
  * @}
@@ -161,7 +161,7 @@ EAPI void edi_mainview_goto(int line);
  *
  */
 
-EAPI Edi_Mainview_Item *edi_mainview_item_current_get();
+Edi_Mainview_Item *edi_mainview_item_current_get();
 
 /**
  * Select the passed item in the mainview UI.
@@ -171,7 +171,7 @@ EAPI Edi_Mainview_Item *edi_mainview_item_current_get();
  *
  * @ingroup Tabs
  */
-EAPI void edi_mainview_item_select(Edi_Mainview_Item *item);
+void edi_mainview_item_select(Edi_Mainview_Item *item);
 
 /**
  * Select the previous open tab.
@@ -179,7 +179,7 @@ EAPI void edi_mainview_item_select(Edi_Mainview_Item *item);
  *
  * @ingroup Tabs
  */
-EAPI void edi_mainview_item_prev();
+void edi_mainview_item_prev();
 
 /**
  * Select the next open tab.
@@ -187,7 +187,7 @@ EAPI void edi_mainview_item_prev();
  *
  * @ingroup Tabs
  */
-EAPI void edi_mainview_item_next();
+void edi_mainview_item_next();
 
 /**
  * @}

src/bin/welcome/edi_welcome.c

@@ -307,7 +307,7 @@ _edi_welcome_add_recent_projects(Evas_Object *box)
    evas_object_show(list);
 }
 
-EAPI Evas_Object *edi_welcome_show()
+Evas_Object *edi_welcome_show()
 {
    Evas_Object *win, *hbx, *box, *button, *label, *image, *naviframe;
    Elm_Object_Item *item;

src/bin/welcome/edi_welcome.h

@@ -28,7 +28,7 @@ extern "C" {
  * @return The welcome window that is created
  * * @ingroup UI
  */
-EAPI Evas_Object *edi_welcome_show();
+Evas_Object *edi_welcome_show();
 
 /**
  * @}