diff options
author | Cosimo Cecchi <cosimoc@gnome.org> | 2009-04-21 15:06:23 +0200 |
---|---|---|
committer | Cosimo Cecchi <cosimoc@gnome.org> | 2009-04-21 15:06:23 +0200 |
commit | b695c970182bbf19f2c38bf7405db506e7c23bb0 (patch) | |
tree | 625e25a7c08c3f8ae6cdc023e8b681ea32a16cea /eel/eel-gtk-extensions.c | |
parent | e2f711533e1008b62c9db70fb3bcf877191866d4 (diff) | |
download | nautilus-b695c970182bbf19f2c38bf7405db506e7c23bb0.tar.gz |
Remove deprecated GDK/GTK+ symbols
Remove all uses of deprecated GDK and GTK+ symbols, replacing them
with the currently supported equivalents.
Based on a patch from Tal Benavidor (#565038).
Diffstat (limited to 'eel/eel-gtk-extensions.c')
-rw-r--r-- | eel/eel-gtk-extensions.c | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/eel/eel-gtk-extensions.c b/eel/eel-gtk-extensions.c index 8b85ec067..87c5454f8 100644 --- a/eel/eel-gtk-extensions.c +++ b/eel/eel-gtk-extensions.c @@ -394,7 +394,7 @@ eel_pop_up_context_menu (GtkMenu *menu, button, /* button */ event ? event->time : GDK_CURRENT_TIME); /* activate_time */ - gtk_object_sink (GTK_OBJECT (menu)); + g_object_ref_sink (menu); } GtkMenuItem * @@ -539,10 +539,10 @@ alive_disconnecter (GtkObject *object, DisconnectInfo *info) void eel_gtk_signal_connect_full_while_alive (GtkObject *object, const gchar *name, - GtkSignalFunc func, + GCallback func, GtkCallbackMarshal marshal, gpointer data, - GtkDestroyNotify destroy_func, + GDestroyNotify destroy_func, gboolean object_signal, gboolean after, GtkObject *alive_object) @@ -628,7 +628,7 @@ while_realized_disconnecter (GtkObject *object, void eel_gtk_signal_connect_while_realized (GtkObject *object, const char *name, - GtkSignalFunc callback, + GCallback callback, gpointer callback_data, GtkWidget *realized_widget) { @@ -1012,7 +1012,7 @@ eel_gtk_get_system_font (void) font = pango_font_description_copy (label->style->font_desc); - gtk_object_sink (GTK_OBJECT (label)); + g_object_ref_sink (label); return font; } @@ -1046,20 +1046,6 @@ eel_gtk_widget_get_motion_event_location (GtkWidget *widget, eel_gtk_widget_get_button_event_location (widget, (const GdkEventButton *) event, x, y); } -gboolean -eel_gtk_tree_view_cell_is_completely_visible (GtkTreeView *tree_view, - GtkTreePath *path, - GtkTreeViewColumn *column) -{ - GdkRectangle cell_rect, visible_rect; - - gtk_tree_view_get_background_area (tree_view, path, column, &cell_rect); - gtk_tree_view_widget_to_tree_coords (tree_view, cell_rect.x, cell_rect.y, - &cell_rect.x, &cell_rect.y); - gtk_tree_view_get_visible_rect (tree_view, &visible_rect); - return eel_gdk_rectangle_contains_rectangle (visible_rect, cell_rect); -} - static gboolean tree_view_button_press_callback (GtkWidget *tree_view, GdkEventButton *event, |