E CVS: apps/e devilhorns

[Enlightenment CVS]

Enlightenment CVS committal

Author  : devilhorns
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/modules/conf_window_remembers


Modified Files:
        e_int_config_remembers.c 


Log Message:

Fix remember sorting.

===================================================================
RCS file: 
/cvs/e/e17/apps/e/src/modules/conf_window_remembers/e_int_config_remembers.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_int_config_remembers.c    13 May 2008 06:20:15 -0000      1.4
+++ e_int_config_remembers.c    13 May 2008 07:05:27 -0000      1.5
@@ -41,10 +41,8 @@
    E_Remember *rem2 = NULL;
    const char *d1, *d2;
 
-   rem1 = data1;
-   rem2 = data2;
-   if (!rem1) return 1;
-   if (!rem2) return -1;
+   if (!(rem1 = data1)) return 1;
+   if (!(rem2 = data2)) return -1;
 
    if (rem1->name)
      d1 = rem1->name;
@@ -145,8 +143,9 @@
    e_widget_ilist_freeze(cfdata->list);
    e_widget_ilist_clear(cfdata->list);
 
-   //for (l = evas_list_sort(e_config->remembers, -1, _cb_sort); l; l = 
l->next) 
-   for (l = e_config->remembers; l; l = l->next) 
+   l = e_config->remembers;
+   for (l = evas_list_sort(l, -1, _cb_sort); l; l = l->next) 
+   //for (l = e_config->remembers; l; l = l->next) 
      {
         E_Remember *rem = NULL;
 
@@ -167,6 +166,10 @@
 
    e_widget_ilist_go(cfdata->list);
    e_widget_min_size_get(cfdata->list, &w, NULL);
+
+   /* NB: make the window look a bit better by not being so small */
+   if (w < 300) w = 300;
+
    e_widget_min_size_set(cfdata->list, w, 200);
    e_widget_ilist_thaw(cfdata->list);
    edje_thaw();
@@ -216,10 +219,14 @@
    n = e_widget_ilist_selected_get(cfdata->list);
    if ((rem = e_widget_ilist_nth_data_get(cfdata->list, n)))
      {
-       e_widget_label_text_set(cfdata->name, rem->name ? rem->name : _("<No 
Name>"));
-       e_widget_label_text_set(cfdata->class, rem->class ? rem->class : _("<No 
Class>"));
-       e_widget_label_text_set(cfdata->title, rem->title ? rem->title : _("<No 
Title>"));
-       e_widget_label_text_set(cfdata->role, rem->role ? rem->role : _("<No 
Role>"));
+       e_widget_label_text_set(cfdata->name, rem->name ? 
+                                rem->name : _("<No Name>"));
+       e_widget_label_text_set(cfdata->class, rem->class ? 
+                                rem->class : _("<No Class>"));
+       e_widget_label_text_set(cfdata->title, rem->title ? 
+                                rem->title : _("<No Title>"));
+       e_widget_label_text_set(cfdata->role, rem->role ? 
+                                rem->role : _("<No Role>"));
      }
 
    if (e_widget_ilist_selected_count_get(cfdata->list) < 1)



-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft 
Defy all challenges. Microsoft(R) Visual Studio 2008. 
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs