Fix #149547, Markus Lausser:

[~andy/gtk] / gtk / gtkfilesel.c

diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c
index 3962e4394dee71a437c49ff3809454a7ef5524da..ad0516c1096b709e3fbc4254e918b0dae0e76aca 100644 (file)
--- a/gtk/gtkfilesel.c
+++ b/gtk/gtkfilesel.c
@@ -24,7 +24,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <stdio.h>
 #include <sys/types.h>
@@ -55,6 +55,7 @@
 #endif
 
 #include "gdk/gdkkeysyms.h"
+#include "gtkalias.h"
 #include "gtkbutton.h"
 #include "gtkcellrenderertext.h"
 #include "gtkentry.h"
@@ -556,23 +557,23 @@ gtk_file_selection_class_init (GtkFileSelectionClass *class)
   g_object_class_install_property (gobject_class,
                                    PROP_FILENAME,
                                    g_param_spec_string ("filename",
-                                                        _("Filename"),
-                                                        _("The currently selected filename"),
+                                                        P_("Filename"),
+                                                        P_("The currently selected filename"),
                                                         NULL,
                                                         G_PARAM_READABLE | G_PARAM_WRITABLE));
   g_object_class_install_property (gobject_class,
                                   PROP_SHOW_FILEOPS,
                                   g_param_spec_boolean ("show_fileops",
-                                                        _("Show file operations"),
-                                                        _("Whether buttons for creating/manipulating files should be displayed"),
+                                                        P_("Show file operations"),
+                                                        P_("Whether buttons for creating/manipulating files should be displayed"),
                                                         FALSE,
                                                         G_PARAM_READABLE |
                                                         G_PARAM_WRITABLE));
   g_object_class_install_property (gobject_class,
                                   PROP_SELECT_MULTIPLE,
                                   g_param_spec_boolean ("select_multiple",
-                                                        _("Select multiple"),
-                                                        _("Whether to allow multiple files to be selected"),
+                                                        P_("Select multiple"),
+                                                        P_("Whether to allow multiple files to be selected"),
                                                         FALSE,
                                                         G_PARAM_READABLE |
                                                         G_PARAM_WRITABLE));
@@ -1371,7 +1372,7 @@ gtk_file_selection_fileop_error (GtkFileSelection *fs,
   dialog = gtk_message_dialog_new (GTK_WINDOW (fs),
                                   GTK_DIALOG_DESTROY_WITH_PARENT,
                                   GTK_MESSAGE_ERROR,
-                                  GTK_BUTTONS_CLOSE,
+                                  GTK_BUTTONS_OK,
                                   "%s", error_message);
 
   /* yes, we free it */
@@ -3136,8 +3137,8 @@ open_new_dir (gchar       *dir_name,
          || !g_utf8_validate (sent->entries[n_entries].entry_name, -1, NULL))
        {
          gchar *escaped_str = g_strescape (dirent, NULL);
-         g_message (_("The filename \"%s\" couldn't be converted to UTF-8 "
-                      "(try setting the environment variable G_BROKEN_FILENAMES): %s"),
+         g_message (_("The filename \"%s\" couldn't be converted to UTF-8. "
+                      "(try setting the environment variable G_FILENAME_ENCODING): %s"),
                     escaped_str,
                     error->message ? error->message : _("Invalid UTF-8"));
          g_free (escaped_str);
@@ -3694,7 +3695,7 @@ find_completion_dir (gchar          *text_to_complete,
       for (i = 0; i < dir->sent->entry_count; i += 1)
        {
          if (dir->sent->entries[i].is_dir &&
-             _gtk_fnmatch (pat_buf, dir->sent->entries[i].entry_name))
+             _gtk_fnmatch (pat_buf, dir->sent->entries[i].entry_name, TRUE))
            {
              if (found)
                {
@@ -3844,7 +3845,7 @@ attempt_file_completion (CompletionState *cmpl_state)
     {
       if (dir->sent->entries[dir->cmpl_index].is_dir)
        {
-         if (_gtk_fnmatch (pat_buf, dir->sent->entries[dir->cmpl_index].entry_name))
+         if (_gtk_fnmatch (pat_buf, dir->sent->entries[dir->cmpl_index].entry_name, TRUE))
            {
              CompletionDir* new_dir;
 
@@ -3892,7 +3893,7 @@ attempt_file_completion (CompletionState *cmpl_state)
       append_completion_text (dir->sent->entries[dir->cmpl_index].entry_name, cmpl_state);
 
       cmpl_state->the_completion.is_a_completion =
-       _gtk_fnmatch (pat_buf, dir->sent->entries[dir->cmpl_index].entry_name);
+       _gtk_fnmatch (pat_buf, dir->sent->entries[dir->cmpl_index].entry_name, TRUE);
 
       cmpl_state->the_completion.is_directory = dir->sent->entries[dir->cmpl_index].is_dir;
       if (dir->sent->entries[dir->cmpl_index].is_dir)