gdk/gdkwindow.c, gtk/gtkwidget.c: Include fallback-c89.c

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

diff --git a/gtk/gtkfilechooserentry.c b/gtk/gtkfilechooserentry.c
index fb6c2b015a02f8766c469241e22ff34286a6374e..ce2b6cc9e7b38dbafe1c0837612541321249105d 100644 (file)
--- a/gtk/gtkfilechooserentry.c
+++ b/gtk/gtkfilechooserentry.c
@@ -13,9 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
@@ -235,23 +233,25 @@ gtk_file_chooser_entry_dispose (GObject *object)
 /* Match functions for the GtkEntryCompletion */
 static gboolean
 match_selected_callback (GtkEntryCompletion  *completion,
-                        GtkTreeModel        *model,
-                        GtkTreeIter         *iter,
-                        GtkFileChooserEntry *chooser_entry)
+                         GtkTreeModel        *model,
+                         GtkTreeIter         *iter,
+                         GtkFileChooserEntry *chooser_entry)
 {
   char *path;
-  
+  gint pos;
+
   gtk_tree_model_get (model, iter,
-                     FULL_PATH_COLUMN, &path,
+                      FULL_PATH_COLUMN, &path,
                       -1);
 
   gtk_editable_delete_text (GTK_EDITABLE (chooser_entry),
-                           0,
+                            0,
                             gtk_editable_get_position (GTK_EDITABLE (chooser_entry)));
+  pos = 0;
   gtk_editable_insert_text (GTK_EDITABLE (chooser_entry),
-                           path,
-                            0,
-                            NULL); 
+                            path,
+                            -1,
+                            &pos);
 
   g_free (path);
 
@@ -558,7 +558,7 @@ set_completion_folder (GtkFileChooserEntry *chooser_entry,
 {
   if (folder_file &&
       chooser_entry->local_only
-      && !g_file_is_native (folder_file))
+      && !_gtk_file_has_native_path (folder_file))
     folder_file = NULL;
 
   if ((chooser_entry->current_folder_file