Use PATH_MAX instead of 4096.

Fix some formatting issues.

SVN revision: 44897

diff --git a/src/bin/e_int_gadcon_config.c b/src/bin/e_int_gadcon_config.c
index 9c9711d..ab76a34 100644 (file)
--- a/src/bin/e_int_gadcon_config.c
+++ b/src/bin/e_int_gadcon_config.c
@@ -235,8 +235,8 @@ _load_avail_gadgets(void *data)
 
         if (!cc) continue;
         // check the current site is allowed for this gadcon client
-        if (cc->func.is_site && !cc->func.is_site(cfdata->site))
-           continue;
+        if ((cc->func.is_site) && (!cc->func.is_site(cfdata->site)))
+          continue;
         if (cc->func.label) lbl = cc->func.label(cc);
         if (!lbl) lbl = cc->name;
         if (cc->func.icon) icon = cc->func.icon(cc, evas);
@@ -337,10 +337,9 @@ _cb_del(void *data, void *data2)
    Eina_List *l = NULL, *g = NULL;
    E_Ilist_Item *item = NULL;
    E_Config_Gadcon_Client *cgc;
-   int i = 0, update = 0;
+   int i = -1, update = 0;
 
    if (!(cfdata = data)) return;
-   i = -1;
    EINA_LIST_FOREACH(e_widget_ilist_items_get(cfdata->o_sel), l, item)
      {
         const char *name = NULL;
@@ -379,7 +378,7 @@ _set_description(void *data, const char *name)
    E_Config_Dialog_Data *cfdata = NULL;
    E_Module *mod = NULL;
    Efreet_Desktop *desk = NULL;
-   char buf[4096];
+   char buf[PATH_MAX];
 
    if (!(cfdata = data)) return;
    if (!name) return;

diff --git a/src/bin/e_int_shelf_config.c b/src/bin/e_int_shelf_config.c
index ea9fbf6..13480fe 100644 (file)
--- a/src/bin/e_int_shelf_config.c
+++ b/src/bin/e_int_shelf_config.c
@@ -11,7 +11,7 @@ static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Co
 static int _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
 static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
 static void _cb_disable_check_list(void *data, Evas_Object *obj);
-static void _calibrate_binginds(void);
+static void _calibrate_bindings(void);
 
 #define MODE_CUSTOM 0
 #define MODE_BOTTOM_MIDDLE 1
@@ -301,7 +301,7 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
    e_shelf_populate(cfdata->es);
    e_shelf_toggle(cfdata->es, 1);
    e_shelf_show(cfdata->es);
-   _calibrate_binginds();
+   _calibrate_bindings();
    e_config_save_queue();
    cfdata->es->config_dialog = cfd;
    return 1; /* Apply was OK */
@@ -484,7 +484,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
      e_shelf_toggle(cfdata->es, 1);
 
    e_zone_useful_geometry_dirty(cfdata->es->zone);
-   _calibrate_binginds();
+   _calibrate_bindings();
    e_config_save_queue();   
    cfdata->es->config_dialog = cfd;
    return 1; /* Apply was OK */
@@ -501,7 +501,7 @@ _cb_configure(void *data, void *data2)
 }
 
 static void
-_calibrate_binginds(void)
+_calibrate_bindings(void)
 {
    E_Binding_Edge *bind;
    Eina_List *l;
@@ -717,8 +717,8 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    n = 0;
    EINA_LIST_FOREACH(styles, l, style)
      {
-       char buf[4096];
-       
+       char buf[PATH_MAX];
+
        ob = e_livethumb_add(evas);
        e_livethumb_vsize_set(ob, 120, 40);
        oj = edje_object_add(e_livethumb_evas_get(ob));