totem r5608 - in trunk: . data src

[pwithnall svn gnome org]

Author: pwithnall
Date: Tue Aug 26 21:29:47 2008
New Revision: 5608
URL: http://svn.gnome.org/viewvc/totem?rev=5608&view=rev

Log:
2008-08-26  Philip Withnall  <philip tecnocode co uk>

	* data/playlist.ui:
	* src/totem-playlist.c: (init_treeview):
	* src/totem-session.c: Move the playlist treeview model to the
	GtkBuilder UI file. Also remove an extraneous #include.
	(Closes: #454243)



Modified:
   trunk/ChangeLog
   trunk/data/playlist.ui
   trunk/src/totem-playlist.c
   trunk/src/totem-session.c

Modified: trunk/data/playlist.ui
==============================================================================
--- trunk/data/playlist.ui	(original)
+++ trunk/data/playlist.ui	Tue Aug 26 21:29:47 2008
@@ -41,6 +41,17 @@
    </ui>
 </object>
 
+<object class="GtkListStore" id="playlist_list_store">
+  <columns>
+    <column type="gint"/><!--playing-->
+    <column type="gchararray"/><!--filename-->
+    <column type="gchararray"/><!--URI-->
+    <column type="gboolean"/><!--custom title-->
+    <column type="gchararray"/><!--subtitle URI-->
+    <column type="GObject"/><!--file monitor-->
+  </columns>
+</object>
+
 <object class="GtkVBox" id="vbox4">
   <property name="border_width">0</property>
   <property name="visible">True</property>
@@ -58,15 +69,16 @@
 
       <child>
 	<object class="GtkTreeView" id="treeview1">
+	  <property name="model">playlist_list_store</property>
 	  <property name="visible">True</property>
-	  <property name="can_focus">True</property>
-	  <property name="headers_visible">True</property>
-	  <property name="rules_hint">False</property>
+	  <property name="can-focus">True</property>
+	  <property name="headers-visible">False</property>
+	  <property name="rules-hint">True</property>
 	  <property name="reorderable">False</property>
-	  <property name="enable_search">True</property>
-	  <property name="fixed_height_mode">False</property>
-	  <property name="hover_selection">False</property>
-	  <property name="hover_expand">False</property>
+	  <property name="enable-search">True</property>
+	  <property name="fixed-height-mode">False</property>
+	  <property name="hover-selection">False</property>
+	  <property name="hover-expand">False</property>
 	</object>
       </child>
     </object>

Modified: trunk/src/totem-playlist.c
==============================================================================
--- trunk/src/totem-playlist.c	(original)
+++ trunk/src/totem-playlist.c	Tue Aug 26 21:29:47 2008
@@ -1328,24 +1328,8 @@
 static void
 init_treeview (GtkWidget *treeview, TotemPlaylist *playlist)
 {
-	GtkTreeModel *model;
 	GtkTreeSelection *selection;
 
-	/* the model */
-	model = GTK_TREE_MODEL (gtk_list_store_new (NUM_COLS,
-				G_TYPE_INT,
-				G_TYPE_STRING,
-				G_TYPE_STRING,
-				G_TYPE_BOOLEAN,
-				G_TYPE_STRING,
-				G_TYPE_OBJECT));
-
-	/* the treeview */
-	gtk_tree_view_set_model (GTK_TREE_VIEW (treeview), model);
-	gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
-	gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE);
-	g_object_unref (G_OBJECT (model));
-
 	init_columns (GTK_TREE_VIEW (treeview), playlist);
 
 	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));

Modified: trunk/src/totem-session.c
==============================================================================
--- trunk/src/totem-session.c	(original)
+++ trunk/src/totem-session.c	Tue Aug 26 21:29:47 2008
@@ -29,7 +29,6 @@
 
 #ifndef HAVE_GTK_ONLY
 
-#include <libgnome/gnome-config.h>
 #include <libgnomeui/gnome-client.h>
 
 static char *