muine r1243 - in trunk: . libmuine src

[lmedinas svn gnome org]

Author: lmedinas
Date: Tue Nov 18 21:22:10 2008
New Revision: 1243
URL: http://svn.gnome.org/viewvc/muine?rev=1243&view=rev

Log:
2008-11-18  Luis Medinas  <lmedinas gnome org>

        * configure.in:
        * libmuine/Makefile.am:
        * libmuine/gsequence.c:
        * libmuine/gsequence.h:
        * libmuine/pointer-list-model.c (pointer_list_model_insert):
        * libmuine/pointer-list-model.h:
        * src/HandleView.cs:
        * src/PlaylistWindow.cs:

        Update to the new gsequence API, closes bgo #464825. 
        Also bump glib to 2.14.
        Patch from Jorn Baayen and Wouter Bolsterlee.



Removed:
   trunk/libmuine/gsequence.c
   trunk/libmuine/gsequence.h
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/libmuine/Makefile.am
   trunk/libmuine/pointer-list-model.c
   trunk/libmuine/pointer-list-model.h
   trunk/src/HandleView.cs
   trunk/src/PlaylistWindow.cs

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Nov 18 21:22:10 2008
@@ -23,6 +23,7 @@
 
 LIBXINE_REQUIRED=1.0.0
 GSTREAMER_REQUIRED=0.10.0
+GLIB_REQUIRED=2.14
 GTK_REQUIRED=2.8
 ICON_THEME_REQUIRED=2.10
 MONO_REQUIRED=1.1
@@ -52,6 +53,7 @@
 		  gconf-2.0 \
 		  gdk-pixbuf-2.0 \
 		  gnome-vfs-2.0 \
+                  glib-2.0 >= $GLIB_REQUIRED \
 		  gtk+-2.0 >= $GTK_REQUIRED \
 		  gnome-icon-theme >= $ICON_THEME_REQUIRED \
 		  $audio_pkgconfig)

Modified: trunk/libmuine/Makefile.am
==============================================================================
--- trunk/libmuine/Makefile.am	(original)
+++ trunk/libmuine/Makefile.am	Tue Nov 18 21:22:10 2008
@@ -26,8 +26,6 @@
 	$(gst_sources)			\
 	macros.h			\
 	player.h			\
-	gsequence.c			\
-	gsequence.h			\
 	pointer-list-model.c		\
 	pointer-list-model.h		\
 	db.c				\

Modified: trunk/libmuine/pointer-list-model.c
==============================================================================
--- trunk/libmuine/pointer-list-model.c	(original)
+++ trunk/libmuine/pointer-list-model.c	Tue Nov 18 21:22:10 2008
@@ -482,7 +482,7 @@
   }
 
   if (before_ptr != NULL)
-    g_sequence_move (new_ptr, g_sequence_iter_prev (before_ptr));
+    g_sequence_move (new_ptr, before_ptr);
 
   g_hash_table_insert (model->reverse_map, pointer, new_ptr);
 

Modified: trunk/libmuine/pointer-list-model.h
==============================================================================
--- trunk/libmuine/pointer-list-model.h	(original)
+++ trunk/libmuine/pointer-list-model.h	Tue Nov 18 21:22:10 2008
@@ -23,7 +23,7 @@
 #define __POINTER_LIST_MODEL_H__
 
 #include <gtk/gtk.h>
-#include "gsequence.h"
+#include <glib.h>
 
 #define TYPE_POINTER_LIST_MODEL		 (pointer_list_model_get_type ())
 #define POINTER_LIST_MODEL(obj)		 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_POINTER_LIST_MODEL, PointerListModel))

Modified: trunk/src/HandleView.cs
==============================================================================
--- trunk/src/HandleView.cs	(original)
+++ trunk/src/HandleView.cs	Tue Nov 18 21:22:10 2008
@@ -36,12 +36,10 @@
 			this.model = new HandleModel ();
 			((TreeView) this).Model = model;
 
-			RulesHint      = true;
-			EnableSearch   = false;
-			HeadersVisible = false;
-
-			// FIXME: Re-enable when Gnome Bugzilla #165017, #165034 are fixed
-			// SetProperty ("fixed_height_mode", new GLib.Value (true));
+			RulesHint       = true;
+			EnableSearch    = false;
+			HeadersVisible  = false;
+                        FixedHeightMode = true;
 		}
 
 		// Properties

Modified: trunk/src/PlaylistWindow.cs
==============================================================================
--- trunk/src/PlaylistWindow.cs	(original)
+++ trunk/src/PlaylistWindow.cs	Tue Nov 18 21:22:10 2008
@@ -166,10 +166,10 @@
 		[Glade.Widget] private Box            menu_bar_box  ;
 		[Glade.Widget] private ScrolledWindow scrolledwindow;
 
-		private Tooltips         tooltips       ;
-		private Gdk.Pixbuf       empty_pixbuf   ;
-		private CellRenderer     pixbuf_renderer;
-		private CellRendererText text_renderer  ;
+		private Tooltips           tooltips       ;
+		private Gdk.Pixbuf         empty_pixbuf   ;
+		private CellRendererPixbuf pixbuf_renderer;
+		private CellRendererText   text_renderer  ;
 		
 		// Widgets :: Containers
 		[Glade.Widget] private Container volume_button_container;
@@ -899,6 +899,8 @@
 			playlist.Selection.Mode = SelectionMode.Multiple;
 
 			pixbuf_renderer = new Gtk.CellRendererPixbuf ();
+                        pixbuf_renderer.FollowState = true;
+
 			text_renderer   = new Gtk.CellRendererText ();
 			text_renderer.Ellipsize = Pango.EllipsizeMode.End;