Enlightenment CVS committal
Author : jethomas
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_filedialog.c ewl_filelist_model.c ewl_filelist_view.c
Log Message:
Bunch of small fixes
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_filedialog.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- ewl_filedialog.c 9 Dec 2007 04:33:39 -0000 1.41
+++ ewl_filedialog.c 9 Dec 2007 06:21:43 -0000 1.42
@@ -411,7 +411,6 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR(fd);
DCHECK_PARAM_PTR(name);
- DCHECK_PARAM_PTR(filter);
DCHECK_TYPE(fd, EWL_FILEDIALOG_TYPE);
ewl_filepicker_filter_add(EWL_FILEPICKER(fd->fp), name, filter,
mime_types);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_filelist_model.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ewl_filelist_model.c 9 Dec 2007 04:33:39 -0000 1.6
+++ ewl_filelist_model.c 9 Dec 2007 06:21:43 -0000 1.7
@@ -7,6 +7,7 @@
#include "ewl_filelist.h"
#include "ewl_io_manager.h"
#include <dirent.h>
+#include <fnmatch.h>
static int ewl_filelist_model_data_name_sort(Ewl_Filelist_File *file1,
Ewl_Filelist_File *file2);
@@ -563,7 +564,8 @@
ecore_list_first_goto(filter->mime_list);
while ((mime_given = ecore_list_next(filter->mime_list)))
{
- if (!strcmp(mime_given, mime_check))
+ if ((mime_check) && (!strcmp(mime_given,
+ mime_check)))
DRETURN_INT(TRUE, DLEVEL_STABLE);
}
}
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_filelist_view.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ewl_filelist_view.c 18 Nov 2007 21:43:35 -0000 1.2
+++ ewl_filelist_view.c 9 Dec 2007 06:21:43 -0000 1.3
@@ -13,7 +13,7 @@
unsigned int row __UNUSED__, unsigned int column)
{
Ewl_Widget *ret;
- const char *img, *stock, *filename;
+ const char *img = NULL, *stock, *filename;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET(data, NULL);
@@ -28,10 +28,16 @@
/* Get and set data into icon */
if (column == 0)
{
- stock = ewl_filelist_stock_icon_get(data);
- img = ewl_icon_theme_icon_path_get(stock, 0);
+ if (!strcmp(data, ".."))
+ img = ewl_icon_theme_icon_path_get
+ (EWL_ICON_GO_UP, 0);
+ else
+ {
+ stock = ewl_filelist_stock_icon_get(data);
+ img = ewl_icon_theme_icon_path_get(stock, 0);
+ }
if (img) ewl_icon_image_set(EWL_ICON(ret),
- img, stock);
+ img, NULL);
filename = ecore_file_file_get(data);
ewl_icon_label_set(EWL_ICON(ret), filename);
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
