[gtk+/multiroot-filechooser: 26/30] Make _gtk_file_chooser_is_uri_in_roots() private



commit 00592c3d4ada517bae261bb8996d91a5e595a192
Author: Federico Mena Quintero <federico novell com>
Date:   Mon Sep 6 15:20:37 2010 -0500

    Make _gtk_file_chooser_is_uri_in_roots() private
    
    It is no longer used by the derived classes
    
    Signed-off-by: Federico Mena Quintero <federico novell com>

 gtk/gtkfilechooser.c        |   11 ++++-------
 gtk/gtkfilechooserprivate.h |    2 --
 2 files changed, 4 insertions(+), 9 deletions(-)
---
diff --git a/gtk/gtkfilechooser.c b/gtk/gtkfilechooser.c
index ed71ef7..68023ff 100644
--- a/gtk/gtkfilechooser.c
+++ b/gtk/gtkfilechooser.c
@@ -2898,16 +2898,13 @@ uri_is_in_roots_strv (const char *uri, gchar **roots)
   return FALSE;
 }
 
-gboolean
-_gtk_file_chooser_is_uri_in_roots (GtkFileChooser *chooser,
-				   const char     *uri)
+static gboolean
+is_uri_in_roots (GtkFileChooser *chooser,
+		 const char     *uri)
 {
   gchar **root_uris;
   gboolean is_in_roots;
 
-  g_return_val_if_fail (GTK_IS_FILE_CHOOSER (chooser), FALSE);
-  g_return_val_if_fail (uri != NULL, FALSE);
-
   root_uris = gtk_file_chooser_get_root_uris (chooser);
   is_in_roots = uri_is_in_roots_strv (uri, root_uris);
   g_strfreev (root_uris);
@@ -2926,7 +2923,7 @@ _gtk_file_chooser_is_file_in_roots (GtkFileChooser *chooser,
   g_return_val_if_fail (file != NULL, FALSE);
 
   uri = g_file_get_uri (file);
-  result = _gtk_file_chooser_is_uri_in_roots (chooser, uri);
+  result = is_uri_in_roots (chooser, uri);
   g_free (uri);
 
   return result;
diff --git a/gtk/gtkfilechooserprivate.h b/gtk/gtkfilechooserprivate.h
index 90449b5..a4884fe 100644
--- a/gtk/gtkfilechooserprivate.h
+++ b/gtk/gtkfilechooserprivate.h
@@ -106,8 +106,6 @@ GSList *       _gtk_file_chooser_list_shortcut_folder_files (GtkFileChooser *cho
 
 GSList *       _gtk_file_chooser_list_shortcut_folder_files (GtkFileChooser *chooser);
 
-gboolean       _gtk_file_chooser_is_uri_in_roots (GtkFileChooser *chooser,
-						  const char     *uri);
 gboolean       _gtk_file_chooser_is_file_in_roots (GtkFileChooser *chooser,
 						   GFile          *file);
 GSList *       _gtk_file_chooser_get_visible_roots (GtkFileChooser *chooser);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]