cleanup

SVN revision: 49188

src/modules/everything/Makefile.am

@@ -33,9 +33,9 @@ module_la_SOURCES      = $(EVRYHEADERS) \
 	                 evry_plugin.c \
 			 evry_plug_aggregator.c \
 			 evry_plug_actions.c \
-			 evry_view_plugin_tabs.c \
-			 evry_plug_view_thumb.c \
-			 evry_plug_view_help.c \
+			 evry_view.c \
+			 evry_view_tabs.c \
+			 evry_view_help.c \
 			 evry_plug_clipboard.c \
 			 evry_plug_text.c \
 			 md5.h \

src/modules/everything/e_mod_main.c

@@ -67,10 +67,10 @@ e_modapi_init(E_Module *m)
    evry_history_init();
 
    evry_plug_actions_init();
-   view_thumb_init();
-   view_help_init();
    evry_plug_clipboard_init();
    evry_plug_text_init();
+   evry_view_init();
+   evry_view_help_init();
 
    /* add module supplied action */
    act = e_action_add("everything");
@@ -171,8 +171,8 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
 
    evry_shutdown();
 
-   view_thumb_shutdown();
-   view_help_shutdown();
+   evry_view_shutdown();
+   evry_view_help_shutdown();
    evry_plug_clipboard_shutdown();
    evry_plug_text_shutdown();
    evry_plug_actions_shutdown();

src/modules/everything/e_mod_main.h

@@ -271,14 +271,11 @@ const char *evry_type_get(Evry_Type type);
 Tab_View *evry_tab_view_new(Evry_View *view, const Evry_State *s, Evas *e);
 void  evry_tab_view_free(Tab_View *v);
 
-Eina_Bool view_thumb_init(void);
-void  view_thumb_shutdown(void);
+Eina_Bool evry_view_init(void);
+void  evry_view_shutdown(void);
 
-Eina_Bool view_help_init(void);
-void  view_help_shutdown(void);
-
-Eina_Bool view_preview_init(void);
-void  view_preview_shutdown(void);
+Eina_Bool evry_view_help_init(void);
+void  evry_view_help_shutdown(void);
 
 Eina_Bool evry_plug_clipboard_init(void);
 void  evry_plug_clipboard_shutdown(void);

src/modules/everything/evry_view.c

@@ -302,7 +302,7 @@ _item_show(View *v, Item *it, Evas_Object *list)
 
 	evas_object_clip_set(it->frame, evas_object_clip_get(list));
 
-	if (it->selected)
+	if (it->selected && v->mode == VIEW_MODE_THUMB)
 	  edje_object_signal_emit(it->frame, "e,state,selected", "e");
 
 	if (it->item->marked)
@@ -1626,7 +1626,7 @@ _view_destroy(Evry_View *view)
 }
 
 Eina_Bool
-view_thumb_init(void)
+evry_view_init(void)
 {
    if (!evry_api_version_check(EVRY_API_VERSION))
      return EINA_FALSE;
@@ -1650,7 +1650,7 @@ view_thumb_init(void)
 }
 
 void
-view_thumb_shutdown(void)
+evry_view_shutdown(void)
 {
    evry_view_unregister(EVRY_VIEW(view));
    E_FREE(view);

src/modules/everything/evry_view_help.c

@@ -118,7 +118,7 @@ _view_destroy(Evry_View *v)
 }
 
 Eina_Bool
-view_help_init(void)
+evry_view_help_init(void)
 {
    if (!evry_api_version_check(EVRY_API_VERSION))
      return EINA_FALSE;
@@ -139,7 +139,7 @@ view_help_init(void)
 }
 
 void
-view_help_shutdown(void)
+evry_view_help_shutdown(void)
 {
    evry_view_unregister(view);
    E_FREE(view);