Don't append a * to the pattern to complete if the user entered one

herself.  This way one can complete *.h and don't get matches on any
.help files, for instance.

ChangeLog

@@ -5,9 +5,13 @@
 	* gtk/gtkfilesel.c: Use g_get_current_dir(). Merge in Win32
 	version: Use G_DIR_SEPARATOR, g_path_is_absolute, no tilde
 	expansion (based on HAVE_PWD_H), allow for drive letters. UNC
-	names not handled yet. Also, code from Craig Setera's port to
-	Win32 that uses cygwin.dll
+	paths (\\server\share\...) not handled yet. Also, code from Craig
+	Setera's port to Win32 that uses cygwin.dll
 
+	* gtk/gtkfilesel.c: Don't append a * to the pattern to complete if
+	the user entered one herself.  This way one can complete *.h and
+	don't get matches on any .help files, for instance.
+	
 Tue Mar  9 01:01:28 1999  Tim Janik  <timj@gtk.org>
 
         * gdk/gdkfont.c (gdk_font_load): first lookup the xfont ID in our

ChangeLog.pre-2-0

@@ -5,9 +5,13 @@
 	* gtk/gtkfilesel.c: Use g_get_current_dir(). Merge in Win32
 	version: Use G_DIR_SEPARATOR, g_path_is_absolute, no tilde
 	expansion (based on HAVE_PWD_H), allow for drive letters. UNC
-	names not handled yet. Also, code from Craig Setera's port to
-	Win32 that uses cygwin.dll
+	paths (\\server\share\...) not handled yet. Also, code from Craig
+	Setera's port to Win32 that uses cygwin.dll
 
+	* gtk/gtkfilesel.c: Don't append a * to the pattern to complete if
+	the user entered one herself.  This way one can complete *.h and
+	don't get matches on any .help files, for instance.
+	
 Tue Mar  9 01:01:28 1999  Tim Janik  <timj@gtk.org>
 
         * gdk/gdkfont.c (gdk_font_load): first lookup the xfont ID in our

ChangeLog.pre-2-10

@@ -5,9 +5,13 @@
 	* gtk/gtkfilesel.c: Use g_get_current_dir(). Merge in Win32
 	version: Use G_DIR_SEPARATOR, g_path_is_absolute, no tilde
 	expansion (based on HAVE_PWD_H), allow for drive letters. UNC
-	names not handled yet. Also, code from Craig Setera's port to
-	Win32 that uses cygwin.dll
+	paths (\\server\share\...) not handled yet. Also, code from Craig
+	Setera's port to Win32 that uses cygwin.dll
 
+	* gtk/gtkfilesel.c: Don't append a * to the pattern to complete if
+	the user entered one herself.  This way one can complete *.h and
+	don't get matches on any .help files, for instance.
+	
 Tue Mar  9 01:01:28 1999  Tim Janik  <timj@gtk.org>
 
         * gdk/gdkfont.c (gdk_font_load): first lookup the xfont ID in our

ChangeLog.pre-2-2

@@ -5,9 +5,13 @@
 	* gtk/gtkfilesel.c: Use g_get_current_dir(). Merge in Win32
 	version: Use G_DIR_SEPARATOR, g_path_is_absolute, no tilde
 	expansion (based on HAVE_PWD_H), allow for drive letters. UNC
-	names not handled yet. Also, code from Craig Setera's port to
-	Win32 that uses cygwin.dll
+	paths (\\server\share\...) not handled yet. Also, code from Craig
+	Setera's port to Win32 that uses cygwin.dll
 
+	* gtk/gtkfilesel.c: Don't append a * to the pattern to complete if
+	the user entered one herself.  This way one can complete *.h and
+	don't get matches on any .help files, for instance.
+	
 Tue Mar  9 01:01:28 1999  Tim Janik  <timj@gtk.org>
 
         * gdk/gdkfont.c (gdk_font_load): first lookup the xfont ID in our

ChangeLog.pre-2-4

@@ -5,9 +5,13 @@
 	* gtk/gtkfilesel.c: Use g_get_current_dir(). Merge in Win32
 	version: Use G_DIR_SEPARATOR, g_path_is_absolute, no tilde
 	expansion (based on HAVE_PWD_H), allow for drive letters. UNC
-	names not handled yet. Also, code from Craig Setera's port to
-	Win32 that uses cygwin.dll
+	paths (\\server\share\...) not handled yet. Also, code from Craig
+	Setera's port to Win32 that uses cygwin.dll
 
+	* gtk/gtkfilesel.c: Don't append a * to the pattern to complete if
+	the user entered one herself.  This way one can complete *.h and
+	don't get matches on any .help files, for instance.
+	
 Tue Mar  9 01:01:28 1999  Tim Janik  <timj@gtk.org>
 
         * gdk/gdkfont.c (gdk_font_load): first lookup the xfont ID in our

ChangeLog.pre-2-6

@@ -5,9 +5,13 @@
 	* gtk/gtkfilesel.c: Use g_get_current_dir(). Merge in Win32
 	version: Use G_DIR_SEPARATOR, g_path_is_absolute, no tilde
 	expansion (based on HAVE_PWD_H), allow for drive letters. UNC
-	names not handled yet. Also, code from Craig Setera's port to
-	Win32 that uses cygwin.dll
+	paths (\\server\share\...) not handled yet. Also, code from Craig
+	Setera's port to Win32 that uses cygwin.dll
 
+	* gtk/gtkfilesel.c: Don't append a * to the pattern to complete if
+	the user entered one herself.  This way one can complete *.h and
+	don't get matches on any .help files, for instance.
+	
 Tue Mar  9 01:01:28 1999  Tim Janik  <timj@gtk.org>
 
         * gdk/gdkfont.c (gdk_font_load): first lookup the xfont ID in our

ChangeLog.pre-2-8

@@ -5,9 +5,13 @@
 	* gtk/gtkfilesel.c: Use g_get_current_dir(). Merge in Win32
 	version: Use G_DIR_SEPARATOR, g_path_is_absolute, no tilde
 	expansion (based on HAVE_PWD_H), allow for drive letters. UNC
-	names not handled yet. Also, code from Craig Setera's port to
-	Win32 that uses cygwin.dll
+	paths (\\server\share\...) not handled yet. Also, code from Craig
+	Setera's port to Win32 that uses cygwin.dll
 
+	* gtk/gtkfilesel.c: Don't append a * to the pattern to complete if
+	the user entered one herself.  This way one can complete *.h and
+	don't get matches on any .help files, for instance.
+	
 Tue Mar  9 01:01:28 1999  Tim Janik  <timj@gtk.org>
 
         * gdk/gdkfont.c (gdk_font_load): first lookup the xfont ID in our

gtk/gtkfilesel.c

@@ -2797,7 +2797,12 @@ attempt_file_completion(CompletionState *cmpl_state)
 
       pat_buf = g_new (gchar, len + 2);
       strcpy(pat_buf, dir->cmpl_text);
-      strcpy(pat_buf + len, "*");
+      /* Don't append a * if the user entered one herself.
+       * This way one can complete *.h and don't get matches
+       * on any .help files, for instance.
+       */
+      if (strchr(pat_buf, '*') == NULL)
+	strcpy(pat_buf + len, "*");
     }
 
   if(first_slash)