[maemo-commits] [maemo-commits] r9665 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gtk

[From: subversion at stage.maemo.org]

Author: kris
Date: 2007-02-06 13:25:12 +0200 (Tue, 06 Feb 2007)
New Revision: 9665

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktreeview.c
Log:
2007-02-06  Kristian Rietveld  <kris at imendio.com>

	Merge from upstream trunk:

	* gtk/gtktreeview.c (gtk_tree_view_row_changed): remove unused
	style_get of vertical-separator. (#403165, Chris Wilson).



Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-02-06 10:18:00 UTC (rev 9664)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-02-06 11:25:12 UTC (rev 9665)
@@ -1,3 +1,10 @@
+2007-02-06  Kristian Rietveld  <kris at imendio.com>
+
+	Merge from upstream trunk:
+
+	* gtk/gtktreeview.c (gtk_tree_view_row_changed): remove unused
+	style_get of vertical-separator. (#403165, Chris Wilson).
+
 2007-02-05  Tommi Komulainen  <tommi.komulainen at nokia.com>
 
 	* gtk/gtkmenu.c (gtk_menu_paint): Paint the scroll arrow backgrounds

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktreeview.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktreeview.c	2007-02-06 10:18:00 UTC (rev 9664)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktreeview.c	2007-02-06 11:25:12 UTC (rev 9665)
@@ -8465,7 +8465,6 @@
   GtkRBTree *tree;
   GtkRBNode *node;
   gboolean free_path = FALSE;
-  gint vertical_separator;
   GList *list;
   GtkTreePath *cursor_path;
 
@@ -8488,8 +8487,6 @@
   if (cursor_path != NULL)
     gtk_tree_path_free (cursor_path);
 
-  gtk_widget_style_get (GTK_WIDGET (data), "vertical-separator", &vertical_separator, NULL);
-
   if (path == NULL)
     {
       path = gtk_tree_model_get_path (model, iter);