fix warnings, remove unused variables

SVN revision: 53978

src/modules/everything-apps/e_mod_main.c

@@ -560,7 +560,7 @@ static Evry_Plugin *
 _begin_mime(Evry_Plugin *plugin, const Evry_Item *item)
 {
    Plugin *p = NULL;
-   Efreet_Desktop *d, *d2;
+   Efreet_Desktop *d;
    const char *mime;
    const char *path = NULL;
    Eina_List *l;

src/modules/everything-files/e_mod_main.c

@@ -349,7 +349,7 @@ _cache_mime_get(History_Types *ht, Evry_Item_File *file)
    History_Item *hi;
    Eina_List *l;
    
-   if (he = eina_hash_find(ht->types, file->path))
+   if ((he = eina_hash_find(ht->types, file->path)))
      {
 	EINA_LIST_FOREACH(he->items, l, hi)
 	  {
@@ -401,7 +401,7 @@ _scan_end_func(void *data)
    Data *d = data;
    Plugin *p = d->plugin;
    Evry_Item *item;
-   char *filename, *path, *mime;
+   char *filename, *path;
    Eina_List *l, *ll;
    History_Types *ht = NULL;
 

src/modules/everything-settings/e_mod_main.c

@@ -148,7 +148,9 @@ _fetch(Evry_Plugin *plugin, const char *input)
    EVRY_PLUGIN_ITEMS_ADD(p, p->categories, input, 1, 1);
 
    if (input || p->parent)
-     return EVRY_PLUGIN_ITEMS_ADD(p, p->items, input, 1, 1);
+     EVRY_PLUGIN_ITEMS_ADD(p, p->items, input, 1, 1);
+
+   return !!(plugin->items);
 }
 
 static int

src/modules/everything/e_mod_main.c

@@ -19,7 +19,6 @@ static Ecore_Timer *cleanup_timer;
 
 static E_Config_DD *conf_edd = NULL;
 static E_Config_DD *plugin_conf_edd = NULL;
-static E_Config_DD *collection_conf_edd = NULL;
 
 Evry_Config *evry_conf = NULL;
 int _evry_events[NUM_EVRY_EVENTS];

src/modules/everything/evry.c

@@ -135,7 +135,6 @@ Evry_Window *
 evry_show(E_Zone *zone, E_Zone_Edge edge, const char *params)
 {
    Evry_Window *win;
-   Ecore_X_Window input_window;
    Evry_Selector *sel;
 
    E_OBJECT_CHECK_RETURN(zone, 0);
@@ -701,7 +700,7 @@ _evry_cb_win_delete(E_Win *ewin)
 static void
 _evry_cb_win_move(E_Win *ewin)
 {
-   Evry_Window *win = ewin->data;
+   /* Evry_Window *win = ewin->data; */
    /* evas_object_resize(win->o_main, ewin->w, ewin->h); */
    /* if (win->input_window)
     *   ecore_x_window_move(win->input_window, win->ewin->x, win->ewin->y); */
@@ -846,11 +845,13 @@ _evry_window_new(E_Zone *zone, E_Zone_Edge edge)
    return win;
 }
 
+#if 0
 static void
 _evry_cb_drag_finished(E_Drag *drag, int dropped)
 {
    E_FREE(drag->data);
 }
+#endif
 
 static Eina_Bool
 _evry_cb_mouse(void *data, int type, void *event)
@@ -1499,9 +1500,8 @@ evry_state_push(Evry_Selector *sel, Eina_List *plugins)
 {
    Evry_State *s, *new_state;
    Eina_List *l;
-   Evry_Plugin *p, *pp;
+   Evry_Plugin *p;
    Evry_View *view = NULL;
-   int browse_aggregator = 0;
    Evry_Window *win = sel->win;
 
    s = sel->state;
@@ -1591,7 +1591,7 @@ evry_browse_item(Evry_Item *it)
 	     if ((pref) && (!strcmp(p->name, pref->name)))
 	       continue;
 
-	     if (pp = p->browse(p, it))
+	     if ((pp = p->browse(p, it)))
 	       plugins = eina_list_append(plugins, pp);
 	  }
      }
@@ -1885,7 +1885,6 @@ _evry_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
 #endif
    else if (ev->modifiers)
      {
-	E_Action *act;
 	Eina_List *l;
 	E_Config_Binding_Key *bind;
 	E_Binding_Modifier mod;

src/modules/everything/evry_config.c

@@ -232,9 +232,8 @@ _fill_list(Eina_List *plugins, Evas_Object *obj, int enabled __UNUSED__)
 static void
 _plugin_move(Plugin_Page *page, int dir)
 {
-   Evas_Object *list;
    int sel;
-   Eina_List *plugins, *l1, *l2;
+   Eina_List *l1, *l2;
 
    sel = e_widget_ilist_selected_get(page->list);
 
@@ -735,7 +734,7 @@ _cat_basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 static Evas_Object *
 _cat_basic_create_widgets(E_Config_Dialog *cfd, Evas *e, E_Config_Dialog_Data *cfdata)
 {
-   Evas_Object *o, *of, *ob, *otb;
+   Evas_Object *ob, *otb;
 
    otb = e_widget_toolbook_add(e, 48 * e_scale, 48 * e_scale);
 

src/modules/everything/evry_gadget.c

@@ -98,7 +98,7 @@ _gc_label(E_Gadcon_Client_Class *client_class)
 static Evas_Object *
 _gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas)
 {
-   Evas_Object *o;
+   /* Evas_Object *o; */
    /* char buf[4096];
     *
     * o = edje_object_add(evas);
@@ -139,9 +139,9 @@ _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
    if (ev->button == 1)
      {
 	Evas_Coord x, y, w, h;
-	int cx, cy, px, py, pw, ph;
+	int cx, cy, pw, ph;
 	Evry_Window *win;
-	int dir;
+
 
 	win = evry_show(e_util_zone_current_get(e_manager_current_get()), 0, "Start");
 	if (!win) return;

src/modules/everything/evry_plug_aggregator.c

@@ -19,7 +19,7 @@ static int
 _fetch(Evry_Plugin *plugin, const char *input)
 {
    Plugin *p = (Plugin *) plugin;
-   Evry_Plugin *pp, *pp2;
+   Evry_Plugin *pp;
    Evry_State *s;
    Eina_List *l, *ll, *lp = NULL;
    Evry_Item *it, *it2;
@@ -208,7 +208,7 @@ _fetch(Evry_Plugin *plugin, const char *input)
 		    evry_history_item_usage_set(it, input, context);
 
 		  if ((subj_sel) && (top_level) &&
-		      (!it->usage) && (inp_len < 2))
+		      (!it->usage) && (inp_len < plugin->config->min_query))
 		    continue;
 
 		  items = eina_list_append(items, it);

src/modules/everything/evry_plug_collection.c

@@ -32,8 +32,6 @@ _browse(Evry_Plugin *plugin, const Evry_Item *item)
    pc = item->data;
    pp = pc->plugin;
 
-   GET_PLUGIN(p, item->plugin);
-
    if (pp->begin && (inst = pp->begin(pp, NULL)))
      {
 	if (!strcmp(plugin->name, "Plugins"))

src/modules/everything/evry_plugin.c

@@ -5,6 +5,7 @@ static Eina_List *actions = NULL;
 int
 evry_plugins_init(void)
 {
+   return 1;
 }
 
 void
@@ -122,7 +123,6 @@ evry_plugin_register(Evry_Plugin *p, int type, int priority)
    Eina_List *l;
    Plugin_Config *pc;
    Eina_List *conf[3];
-   int i = 0;
    int new_conf = 0;
 
    if (type < 0 || type > 2)

src/modules/everything/evry_view.c

@@ -84,7 +84,6 @@ _thumb_gen(void *data, Evas_Object *obj, void *event_info)
 {
    Evas_Coord w, h;
    Item *it = data;
-   Smart_Data *sd = evas_object_smart_data_get(it->obj);
 
    if (!it->frame) return;
 
@@ -822,8 +821,6 @@ _pan_item_select(Evas_Object *obj, Item *it, int scroll)
    Smart_Data *sd = evas_object_smart_data_get(obj);
    double align = -1;
    int prev = -1;
-   int align_to = -1;
-   int cur_pos, new_pos;
    
    if (sd->cur_item)
      {
@@ -1475,7 +1472,7 @@ _view_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
 static void
 _view_cb_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
-   Evas_Event_Mouse_Up *ev = event_info;
+   /* Evas_Event_Mouse_Up *ev = event_info; */
    Smart_Data *sd = evas_object_smart_data_get(data);
    if (!sd) return;
    sd->mouse_x = 0;