[maemo-commits] [maemo-commits] r9771 - projects/haf/trunk/hildon-fm/hildon-fm

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-02-09 15:34:28 +0200 (Fri, 09 Feb 2007)
New Revision: 9771

Modified:
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-chooser-dialog.c
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-details-dialog.c
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c
Log:
	* hildon-fm/hildon-file-chooser-dialog.c,
	hildon-fm/hildon-file-details-dialog.c,
	hildon-fm/hildon-file-selection.c: Replaced gtk_object_sink with
	g_object_ref_sink.

	* hildon-fm/hildon-file-selection.c: Don't set "force-list-kludge"
	on GtkTreeViews.


Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-chooser-dialog.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-chooser-dialog.c	2007-02-09 11:56:31 UTC (rev 9770)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-chooser-dialog.c	2007-02-09 13:34:28 UTC (rev 9771)
@@ -778,7 +778,7 @@
     }
 
     g_object_ref(filter);
-    gtk_object_sink(GTK_OBJECT(filter));
+    g_object_ref_sink (GTK_OBJECT(filter));
     priv->filters = g_slist_append(priv->filters, filter);
     if (priv->filters_separator == NULL) {
       priv->filters_separator = gtk_separator_menu_item_new();
@@ -1821,7 +1821,7 @@
     priv->popup = gtk_menu_new();
     shell = GTK_MENU_SHELL(priv->popup);
     g_object_ref(priv->popup);
-    gtk_object_sink(GTK_OBJECT(priv->popup));
+    g_object_ref_sink (GTK_OBJECT(priv->popup));
 
     priv->sort_type =
         gtk_radio_menu_item_new_with_label(NULL, _("sfil_me_sort_type"));

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-details-dialog.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-details-dialog.c	2007-02-09 11:56:31 UTC (rev 9770)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-details-dialog.c	2007-02-09 13:34:28 UTC (rev 9771)
@@ -353,7 +353,7 @@
     
     priv->tab_label = gtk_label_new(_("sfil_ti_notebook_file"));
     g_object_ref(priv->tab_label);
-    gtk_object_sink(GTK_OBJECT(priv->tab_label));
+    g_object_ref_sink (GTK_OBJECT(priv->tab_label));
     gtk_widget_show(priv->tab_label);
 
     priv->file_device = g_object_new(GTK_TYPE_LABEL, "xalign", 0.0f, NULL);

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c	2007-02-09 11:56:31 UTC (rev 9770)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c	2007-02-09 13:34:28 UTC (rev 9771)
@@ -2264,11 +2264,7 @@
     self->priv->view[1] = gtk_tree_view_new();
     tree = GTK_TREE_VIEW(self->priv->view[1]);
 
-    /* Fixed height mode has some kind of problems when appending new content to
-        view. Seems that this is patch bug or Gtk 2.4 bug. Anyway, this works fine with
-        Gtk 2.6. Re-enabled this because we are now using 2.6 only. */
     gtk_tree_view_set_fixed_height_mode(tree, TRUE);
-    g_object_set(tree, "force_list_kludge", TRUE, NULL); 
 
     col = gtk_tree_view_column_new();
     renderer = gtk_cell_renderer_pixbuf_new();
@@ -2333,7 +2329,6 @@
     self->priv->view[0] = gtk_tree_view_new();
     tree = GTK_TREE_VIEW(self->priv->view[0]);
     gtk_tree_view_set_headers_visible(tree, FALSE);
-    g_object_set(tree, "force_list_kludge", TRUE, NULL); 
     /* Fixed height seems to require setting fixed widths for every
        column. This is not a good thing in our case. We would _absolutely_
        need GTK_TREE_VIEW_COLUMN_GROW_ONLY to be supported as well in
@@ -3435,7 +3430,7 @@
 
         if (filter) {
             g_object_ref(filter);
-            gtk_object_sink(GTK_OBJECT(filter));
+            g_object_ref_sink (GTK_OBJECT(filter));
         }
 
         self->priv->filter = filter;