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

[From: subversion at stage.maemo.org]

Author: timj
Date: 2007-01-25 15:09:51 +0200 (Thu, 25 Jan 2007)
New Revision: 9345

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktreeselection.c
Log:
Thu Jan 25 14:08:30 2007  Tim Janik  <timj at imendio.com>

        * gtk/gtktreeselection.c: conditionalize with MAEMO_CHANGES.




Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-01-25 12:57:14 UTC (rev 9344)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-01-25 13:09:51 UTC (rev 9345)
@@ -1,3 +1,7 @@
+Thu Jan 25 14:08:30 2007  Tim Janik  <timj at imendio.com>
+
+	* gtk/gtktreeselection.c: conditionalize with MAEMO_CHANGES.
+
 Thu Jan 25 13:55:47 2007  Tim Janik  <timj at imendio.com>
 
 	* gtk/gtkcellrenderertext.c:

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktreeselection.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktreeselection.c	2007-01-25 12:57:14 UTC (rev 9344)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktreeselection.c	2007-01-25 13:09:51 UTC (rev 9345)
@@ -1231,7 +1231,7 @@
     g_signal_emit (selection, tree_selection_signals[CHANGED], 0);
 }
 
-/* MEAMO START */
+#ifdef MAEMO_CHANGES
 static gboolean
 tree_column_is_sensitive (GtkTreeViewColumn *column,
 			  GtkTreeModel      *model,
@@ -1263,16 +1263,16 @@
 
   return sensitive;
 }
-/* MAEMO END */
+#endif /* MAEMO_CHANGES */
 
 gboolean
 _gtk_tree_selection_row_is_selectable (GtkTreeSelection *selection,
 				       GtkRBNode        *node,
 				       GtkTreePath      *path)
 {
-  /* MAEMO START */
+#ifdef MAEMO_CHANGES
   GList *list;
-  /* MAEMO END */
+#endif /* MAEMO_CHANGES */
   GtkTreeIter iter;
   gboolean sensitive = FALSE;
 
@@ -1288,7 +1288,7 @@
 	return FALSE;
     }
 
-  /* MAEMO START */
+#ifdef MAEMO_CHANGES
   for (list = selection->tree_view->priv->columns; list && !sensitive; list = list->next)
     {
       GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN (list->data);
@@ -1301,7 +1301,7 @@
 
   if (!sensitive)
     return FALSE;
-  /* MAEMO END */
+#endif /* MAEMO_CHANGES */
 
   if (selection->user_func)
     return (*selection->user_func) (selection, selection->tree_view->priv->model, path,
@@ -1488,12 +1488,12 @@
       toggle = _gtk_tree_selection_row_is_selectable (selection, node, path);
       gtk_tree_path_free (path);
 
-      /* MAEMO START */
+#ifdef MAEMO_CHANGES
       /* Allow unselecting an insensitive row */
       if (!toggle && !select
 	  && GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED))
 	toggle = TRUE;
-      /* MAEMO END */
+#endif /* MAEMO_CHANGES */
     }
 
   if (toggle)