summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>1999-06-28 16:08:28 +0000
committerOwen Taylor <otaylor@src.gnome.org>1999-06-28 16:08:28 +0000
commit43e80bc87ac8fc84ed2c87e89d9be74efbbd469f (patch)
treeeebb04cdc8f7ac3f62b85a23602af43feae5c49a
parent4c09ae6026971eeda94e9612e1ba31e640798f24 (diff)
downloadgdk-pixbuf-43e80bc87ac8fc84ed2c87e89d9be74efbbd469f.tar.gz
Don't add an extra "/" when concating "/" + filename. (From Matt Grossman
Mon Jun 28 12:08:25 1999 Owen Taylor <otaylor@redhat.com> * gtk/gtkfilesel.c (cmpl_completion_fullname): Don't add an extra "/" when concating "/" + filename. (From Matt Grossman <mattg@oz.net>)
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.pre-2-06
-rw-r--r--ChangeLog.pre-2-106
-rw-r--r--ChangeLog.pre-2-26
-rw-r--r--ChangeLog.pre-2-46
-rw-r--r--ChangeLog.pre-2-66
-rw-r--r--ChangeLog.pre-2-86
-rw-r--r--gtk/gtkfilesel.c3
8 files changed, 44 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1f7ad8146..45183c341 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jun 28 12:08:25 1999 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkfilesel.c (cmpl_completion_fullname): Don't
+ add an extra "/" when concating "/" + filename.
+ (From Matt Grossman <mattg@oz.net>)
+
Mon Jun 28 10:57:12 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkctree.c (draw_cell_pixmap): Reset clip mask
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 1f7ad8146..45183c341 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Mon Jun 28 12:08:25 1999 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkfilesel.c (cmpl_completion_fullname): Don't
+ add an extra "/" when concating "/" + filename.
+ (From Matt Grossman <mattg@oz.net>)
+
Mon Jun 28 10:57:12 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkctree.c (draw_cell_pixmap): Reset clip mask
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1f7ad8146..45183c341 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Mon Jun 28 12:08:25 1999 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkfilesel.c (cmpl_completion_fullname): Don't
+ add an extra "/" when concating "/" + filename.
+ (From Matt Grossman <mattg@oz.net>)
+
Mon Jun 28 10:57:12 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkctree.c (draw_cell_pixmap): Reset clip mask
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 1f7ad8146..45183c341 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Mon Jun 28 12:08:25 1999 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkfilesel.c (cmpl_completion_fullname): Don't
+ add an extra "/" when concating "/" + filename.
+ (From Matt Grossman <mattg@oz.net>)
+
Mon Jun 28 10:57:12 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkctree.c (draw_cell_pixmap): Reset clip mask
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 1f7ad8146..45183c341 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Mon Jun 28 12:08:25 1999 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkfilesel.c (cmpl_completion_fullname): Don't
+ add an extra "/" when concating "/" + filename.
+ (From Matt Grossman <mattg@oz.net>)
+
Mon Jun 28 10:57:12 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkctree.c (draw_cell_pixmap): Reset clip mask
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 1f7ad8146..45183c341 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Mon Jun 28 12:08:25 1999 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkfilesel.c (cmpl_completion_fullname): Don't
+ add an extra "/" when concating "/" + filename.
+ (From Matt Grossman <mattg@oz.net>)
+
Mon Jun 28 10:57:12 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkctree.c (draw_cell_pixmap): Reset clip mask
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 1f7ad8146..45183c341 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Mon Jun 28 12:08:25 1999 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkfilesel.c (cmpl_completion_fullname): Don't
+ add an extra "/" when concating "/" + filename.
+ (From Matt Grossman <mattg@oz.net>)
+
Mon Jun 28 10:57:12 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkctree.c (draw_cell_pixmap): Reset clip mask
diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c
index 849ae6086..1d0a18dde 100644
--- a/gtk/gtkfilesel.c
+++ b/gtk/gtkfilesel.c
@@ -1536,7 +1536,8 @@ cmpl_completion_fullname (gchar* text, CompletionState* cmpl_state)
else
{
strcpy (cmpl_state->updated_text, cmpl_state->reference_dir->fullname);
- strcat (cmpl_state->updated_text, "/");
+ if (strcmp (cmpl_state->reference_dir->fullname, "/") != 0)
+ strcat (cmpl_state->updated_text, "/");
strcat (cmpl_state->updated_text, text);
}