[Xfce4-commits] <parole:master> Fixed default filter not being displayed in combobox.

[Sean Davis]

Updating branch refs/heads/master
         to 1367c515c940970c4ec7744ead8a94bbe5a9ae46 (commit)
       from 27c3f22614f7dcc857c0484697008b50f99bd74e (commit)

commit 1367c515c940970c4ec7744ead8a94bbe5a9ae46
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Tue Jul 24 06:11:42 2012 -0400

    Fixed default filter not being displayed in combobox.

 data/interfaces/mediachooser.ui |   17 -----------------
 src/parole-mediachooser.c       |   14 +++++---------
 2 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/data/interfaces/mediachooser.ui b/data/interfaces/mediachooser.ui
index cbe19ee..77f2bec 100644
--- a/data/interfaces/mediachooser.ui
+++ b/data/interfaces/mediachooser.ui
@@ -105,7 +105,6 @@
             <property name="orientation">vertical</property>
             <property name="spacing">1</property>
             <property name="create_folders">False</property>
-            <property name="filter">filefilter</property>
             <property name="local_only">False</property>
             <property name="select_multiple">True</property>
             <signal name="file-activated" handler="media_chooser_file_activate_cb" swapped="no"/>
@@ -120,22 +119,6 @@
       </object>
     </child>
   </object>
-  <object class="GtkFileFilter" id="filefilter"/>
-  <object class="GtkImage" id="image1">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-open</property>
-  </object>
-  <object class="GtkImage" id="image2">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-open</property>
-  </object>
-  <object class="GtkImage" id="image3">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-open</property>
-  </object>
   <object class="GtkImage" id="image4">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
diff --git a/src/parole-mediachooser.c b/src/parole-mediachooser.c
index c5b7e7f..c70fad0 100644
--- a/src/parole-mediachooser.c
+++ b/src/parole-mediachooser.c
@@ -191,7 +191,7 @@ parole_media_chooser_open_internal (ParoleMediaChooser *media_chooser)
     GtkWidget       *recursive;
     GtkWidget       *replace;
     GtkWidget       *play_opened;
-    GtkFileFilter   *filter;
+    GtkFileFilter   *filter, *all_files;
     gboolean        scan_recursive;
     gboolean        replace_playlist;
     gboolean        play;
@@ -205,20 +205,16 @@ parole_media_chooser_open_internal (ParoleMediaChooser *media_chooser)
     gtk_widget_hide( media_chooser->spinner );
     
     file_chooser = GTK_WIDGET (gtk_builder_get_object (builder, "filechooserwidget"));
-    filter = gtk_file_chooser_get_filter (GTK_FILE_CHOOSER (file_chooser));
     
+    filter = gtk_file_filter_new();
     gtk_file_filter_set_name( filter, _("Supported files") );
-    
     gtk_file_filter_add_mime_type (GTK_FILE_FILTER (filter), "audio/*");
     gtk_file_filter_add_mime_type (GTK_FILE_FILTER (filter), "video/*");
-    
-    GtkFileFilter *all_files;
+    gtk_file_chooser_add_filter( GTK_FILE_CHOOSER(file_chooser), filter );
+
     all_files = gtk_file_filter_new();
-    gtk_file_filter_add_pattern ( all_files, "*");
-    
     gtk_file_filter_set_name( all_files, _("All files") );
-    
-    gtk_file_chooser_add_filter( GTK_FILE_CHOOSER(file_chooser), filter );
+    gtk_file_filter_add_pattern ( all_files, "*");
     gtk_file_chooser_add_filter( GTK_FILE_CHOOSER(file_chooser), all_files );
 
     folder = parole_rc_read_entry_string ("media-chooser-folder", PAROLE_RC_GROUP_GENERAL, NULL);