Revision: 1478
http://geeqie.svn.sourceforge.net/geeqie/?rev=1478&view=rev
Author: zas_
Date: 2009-03-06 11:42:25 +0000 (Fri, 06 Mar 2009)
Log Message:
-----------
Fix tab completion when entering "/et[TAB]" it was changed to "et", this is
fixed.
Modified Paths:
--------------
trunk/src/ui_tabcomp.c
Modified: trunk/src/ui_tabcomp.c
===================================================================
--- trunk/src/ui_tabcomp.c 2009-03-05 23:32:56 UTC (rev 1477)
+++ trunk/src/ui_tabcomp.c 2009-03-06 11:42:25 UTC (rev 1478)
@@ -386,8 +386,6 @@
entry_dir = g_strdup(entry_text);
}
- entry_file = filename_from_path(entry_text);
-
if (isfile(entry_dir))
{
if (home_exp)
@@ -399,6 +397,8 @@
return home_exp;
}
+ entry_file = filename_from_path(entry_text);
+
if (isdir(entry_dir) && strcmp(entry_file, ".") != 0 &&
strcmp(entry_file, "..") != 0)
{
ptr = entry_dir + strlen(entry_dir) - 1;
@@ -455,7 +455,7 @@
ptr = (gchar *)filename_from_path(entry_dir);
if (ptr > entry_dir) ptr--;
ptr[0] = '\0';
-
+
if (strlen(entry_dir) == 0)
{
g_free(entry_dir);
@@ -473,8 +473,6 @@
tab_completion_read_dir(td, entry_dir);
}
- if (strcmp(entry_dir, G_DIR_SEPARATOR_S) == 0) entry_dir[0] =
'\0'; /* FIXME: win32 */
-
list = td->file_list;
while (list)
{
@@ -494,13 +492,6 @@
gchar *buf;
buf = g_build_filename(entry_dir, file, NULL);
-
- if (isdir(buf))
- {
- gchar *tmp = g_strconcat(buf,
G_DIR_SEPARATOR_S, NULL);
- g_free(buf);
- buf = tmp;
- }
gtk_entry_set_text(GTK_ENTRY(td->entry), buf);
gtk_editable_set_position(GTK_EDITABLE(td->entry), strlen(buf));
g_free(buf);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
Geeqie-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/geeqie-svn
