Updating branch refs/heads/migration-to-gio
to 577080d1d35de25942d2ec3cf6b4b24cf6a0c129 (commit)
from 621c0f4b44e7536d0a1f12a804eab332f596b0a3 (commit)
commit 577080d1d35de25942d2ec3cf6b4b24cf6a0c129
Author: Jannis Pohlmann <jan...@xfce.org>
Date: Thu Aug 13 16:02:26 2009 +0200
Drop exo_gtk_object_ref_sink and exo_gtk_radio_action_set_current_value.
Use g_object_ref_sink() and gtk_radio_action_set_current_value()
instead.
Conflicts:
thunar/thunar-templates-action.c
plugins/thunar-apr/thunar-apr-desktop-page.c | 2 +-
plugins/thunar-sbr/thunar-sbr-date-renamer.c | 2 +-
plugins/thunar-sbr/thunar-sbr-replace-renamer.c | 2 +-
thunar/thunar-abstract-icon-view.c | 4 ++--
thunar/thunar-details-view.c | 6 +++---
thunar/thunar-folder.c | 2 +-
thunar/thunar-gtk-extensions.c | 2 +-
thunar/thunar-standard-view.c | 4 ++--
thunar/thunar-templates-action.c | 2 +-
thunar/thunar-window.c | 2 +-
10 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/plugins/thunar-apr/thunar-apr-desktop-page.c
b/plugins/thunar-apr/thunar-apr-desktop-page.c
index 522b18b..d0d345f 100644
--- a/plugins/thunar-apr/thunar-apr-desktop-page.c
+++ b/plugins/thunar-apr/thunar-apr-desktop-page.c
@@ -140,7 +140,7 @@ thunar_apr_desktop_page_init (ThunarAprDesktopPage
*desktop_page)
/* allocate the shared tooltips */
desktop_page->tooltips = gtk_tooltips_new ();
- exo_gtk_object_ref_sink (GTK_OBJECT (desktop_page->tooltips));
+ g_object_ref_sink (G_OBJECT (desktop_page->tooltips));
/* allocate shared bold Pango attributes */
attr_list = pango_attr_list_new ();
diff --git a/plugins/thunar-sbr/thunar-sbr-date-renamer.c
b/plugins/thunar-sbr/thunar-sbr-date-renamer.c
index 9f8568a..688d105 100644
--- a/plugins/thunar-sbr/thunar-sbr-date-renamer.c
+++ b/plugins/thunar-sbr/thunar-sbr-date-renamer.c
@@ -189,7 +189,7 @@ thunar_sbr_date_renamer_init (ThunarSbrDateRenamer
*date_renamer)
/* allocate tooltips for the renamer */
date_renamer->tooltips = gtk_tooltips_new ();
- exo_gtk_object_ref_sink (GTK_OBJECT (date_renamer->tooltips));
+ g_object_ref_sink (G_OBJECT (date_renamer->tooltips));
vbox = gtk_vbox_new (FALSE, 6);
gtk_box_pack_start (GTK_BOX (date_renamer), vbox, TRUE, TRUE, 0);
diff --git a/plugins/thunar-sbr/thunar-sbr-replace-renamer.c
b/plugins/thunar-sbr/thunar-sbr-replace-renamer.c
index 5b3a595..0f74de0 100644
--- a/plugins/thunar-sbr/thunar-sbr-replace-renamer.c
+++ b/plugins/thunar-sbr/thunar-sbr-replace-renamer.c
@@ -198,7 +198,7 @@ thunar_sbr_replace_renamer_init (ThunarSbrReplaceRenamer
*replace_renamer)
/* allocate the shared tooltips */
replace_renamer->tooltips = gtk_tooltips_new ();
- exo_gtk_object_ref_sink (GTK_OBJECT (replace_renamer->tooltips));
+ g_object_ref_sink (G_OBJECT (replace_renamer->tooltips));
table = gtk_table_new (2, 3, FALSE);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
diff --git a/thunar/thunar-abstract-icon-view.c
b/thunar/thunar-abstract-icon-view.c
index b326ca1..7c42375 100644
--- a/thunar/thunar-abstract-icon-view.c
+++ b/thunar/thunar-abstract-icon-view.c
@@ -788,11 +788,11 @@ thunar_abstract_icon_view_sort_column_changed
(GtkTreeSortable *sortable,
{
/* apply the new sort column */
action = gtk_action_group_get_action (THUNAR_STANDARD_VIEW
(abstract_icon_view)->action_group, "sort-by-name");
- exo_gtk_radio_action_set_current_value (GTK_RADIO_ACTION (action),
column);
+ gtk_radio_action_set_current_value (GTK_RADIO_ACTION (action), column);
/* apply the new sort order */
action = gtk_action_group_get_action (THUNAR_STANDARD_VIEW
(abstract_icon_view)->action_group, "sort-ascending");
- exo_gtk_radio_action_set_current_value (GTK_RADIO_ACTION (action),
order);
+ gtk_radio_action_set_current_value (GTK_RADIO_ACTION (action), order);
}
}
diff --git a/thunar/thunar-details-view.c b/thunar/thunar-details-view.c
index 088184c..7a30871 100644
--- a/thunar/thunar-details-view.c
+++ b/thunar/thunar-details-view.c
@@ -258,18 +258,18 @@ thunar_details_view_init (ThunarDetailsView *details_view)
/* allocate the shared right-aligned text renderer */
right_aligned_renderer = g_object_new (THUNAR_TYPE_TEXT_RENDERER, "xalign",
1.0f, NULL);
- exo_gtk_object_ref_sink (GTK_OBJECT (right_aligned_renderer));
+ g_object_ref_sink (G_OBJECT (right_aligned_renderer));
/* allocate the shared left-aligned text renderer */
left_aligned_renderer = g_object_new (THUNAR_TYPE_TEXT_RENDERER, "xalign",
0.0f, NULL);
- exo_gtk_object_ref_sink (GTK_OBJECT (left_aligned_renderer));
+ g_object_ref_sink (G_OBJECT (left_aligned_renderer));
/* allocate the tree view columns */
for (column = 0; column < THUNAR_N_VISIBLE_COLUMNS; ++column)
{
/* allocate the tree view column */
details_view->columns[column] = gtk_tree_view_column_new ();
- exo_gtk_object_ref_sink (GTK_OBJECT (details_view->columns[column]));
+ g_object_ref_sink (G_OBJECT (details_view->columns[column]));
gtk_tree_view_column_set_min_width (details_view->columns[column], 50);
gtk_tree_view_column_set_resizable (details_view->columns[column], TRUE);
gtk_tree_view_column_set_sort_column_id (details_view->columns[column],
column);
diff --git a/thunar/thunar-folder.c b/thunar/thunar-folder.c
index 676654a..fef3b23 100644
--- a/thunar/thunar-folder.c
+++ b/thunar/thunar-folder.c
@@ -641,7 +641,7 @@ thunar_folder_get_for_file (ThunarFile *file)
folder = g_object_new (THUNAR_TYPE_FOLDER, "corresponding-file", file,
NULL);
/* drop the floating reference */
- exo_gtk_object_ref_sink (GTK_OBJECT (folder));
+ g_object_ref_sink (G_OBJECT (folder));
/* connect the folder to the file */
g_object_set_qdata (G_OBJECT (file), thunar_folder_quark, folder);
diff --git a/thunar/thunar-gtk-extensions.c b/thunar/thunar-gtk-extensions.c
index d68e3a8..952f93a 100644
--- a/thunar/thunar-gtk-extensions.c
+++ b/thunar/thunar-gtk-extensions.c
@@ -193,7 +193,7 @@ thunar_gtk_menu_run (GtkMenu *menu,
_thunar_return_if_fail (GTK_IS_MENU (menu));
/* take over the floating reference on the menu */
- exo_gtk_object_ref_sink (GTK_OBJECT (menu));
+ g_object_ref_sink (G_OBJECT (menu));
/* place the menu on the same screen as the parent */
if (G_UNLIKELY (parent != NULL && GDK_IS_SCREEN (parent)))
diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c
index 36990bb..c1e905f 100644
--- a/thunar/thunar-standard-view.c
+++ b/thunar/thunar-standard-view.c
@@ -629,12 +629,12 @@ thunar_standard_view_init (ThunarStandardView
*standard_view)
/* setup the icon renderer */
standard_view->icon_renderer = thunar_icon_renderer_new ();
- exo_gtk_object_ref_sink (GTK_OBJECT (standard_view->icon_renderer));
+ g_object_ref_sink (G_OBJECT (standard_view->icon_renderer));
exo_binding_new (G_OBJECT (standard_view), "zoom-level", G_OBJECT
(standard_view->icon_renderer), "size");
/* setup the name renderer */
standard_view->name_renderer = thunar_text_renderer_new ();
- exo_gtk_object_ref_sink (GTK_OBJECT (standard_view->name_renderer));
+ g_object_ref_sink (G_OBJECT (standard_view->name_renderer));
exo_binding_new (G_OBJECT (standard_view->preferences), "misc-single-click",
G_OBJECT (standard_view->name_renderer), "follow-prelit");
/* be sure to update the selection whenever the folder changes */
diff --git a/thunar/thunar-templates-action.c b/thunar/thunar-templates-action.c
index 727f13a..d78129c 100644
--- a/thunar/thunar-templates-action.c
+++ b/thunar/thunar-templates-action.c
@@ -373,7 +373,7 @@ thunar_templates_action_files_ready (ThunarJob
*job,
{
/* allocate a new submenu for the directory */
submenu = gtk_menu_new ();
- exo_gtk_object_ref_sink (GTK_OBJECT (submenu));
+ g_object_ref_sink (G_OBJECT (submenu));
gtk_menu_set_screen (GTK_MENU (submenu), gtk_widget_get_screen
(menu));
/* allocate a new menu item for the directory */
diff --git a/thunar/thunar-window.c b/thunar/thunar-window.c
index d072fe2..7578e1a 100644
--- a/thunar/thunar-window.c
+++ b/thunar/thunar-window.c
@@ -883,7 +883,7 @@ thunar_window_init (ThunarWindow *window)
/* activate the selected view */
action = gtk_action_group_get_action (window->action_group, "view-as-icons");
- exo_gtk_radio_action_set_current_value (GTK_RADIO_ACTION (action),
view_type2index (g_type_is_a (type, THUNAR_TYPE_VIEW) ? type :
THUNAR_TYPE_ICON_VIEW));
+ gtk_radio_action_set_current_value (GTK_RADIO_ACTION (action),
view_type2index (g_type_is_a (type, THUNAR_TYPE_VIEW) ? type :
THUNAR_TYPE_ICON_VIEW));
g_signal_connect (G_OBJECT (action), "changed", G_CALLBACK
(thunar_window_action_view_changed), window);
thunar_window_action_view_changed (GTK_RADIO_ACTION (action),
GTK_RADIO_ACTION (action), window);
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
