X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=cut-n-paste%2Ftoolbar-editor%2Fegg-toolbar-editor.c;h=9d314082622450cbc234ad7f4dbf3fcf6d1215ac;hb=d4139205b010ed06310d14284e63114e88ec6de2;hp=6db20134b7211e1a758cf59497bb0e3e4cb2e3cd;hpb=0a8ca94b8cb16d63e63cad2edce7a9035322ff3d;p=evince.git diff --git a/cut-n-paste/toolbar-editor/egg-toolbar-editor.c b/cut-n-paste/toolbar-editor/egg-toolbar-editor.c index 6db20134..9d314082 100644 --- a/cut-n-paste/toolbar-editor/egg-toolbar-editor.c +++ b/cut-n-paste/toolbar-editor/egg-toolbar-editor.c @@ -322,7 +322,8 @@ drag_data_get_cb (GtkWidget *widget, target = g_object_get_data (G_OBJECT (widget), "egg-item-name"); g_return_if_fail (target != NULL); - gtk_selection_data_set (selection_data, selection_data->target, 8, + gtk_selection_data_set (selection_data, + gtk_selection_data_get_target (selection_data), 8, (const guchar *) target, strlen (target)); } @@ -362,8 +363,8 @@ set_drag_cursor (GtkWidget *widget) cursor = gdk_cursor_new_for_display (gdk_screen_get_display (screen), GDK_HAND2); - gdk_window_set_cursor (widget->window, cursor); - gdk_cursor_unref (cursor); + gdk_window_set_cursor (gtk_widget_get_window (widget), cursor); + g_object_unref (cursor); } static void @@ -380,8 +381,8 @@ event_box_realize_cb (GtkWidget *widget, GtkImage *icon) GdkPixbuf *pixbuf; gtk_image_get_stock (icon, &stock_id, NULL); - pixbuf = gtk_widget_render_icon (widget, stock_id, - GTK_ICON_SIZE_LARGE_TOOLBAR, NULL); + pixbuf = gtk_widget_render_icon_pixbuf (widget, stock_id, + GTK_ICON_SIZE_LARGE_TOOLBAR); gtk_drag_source_set_icon_pixbuf (widget, pixbuf); g_object_unref (pixbuf); } @@ -631,11 +632,11 @@ update_editor_sheet (EggToolbarEditor *editor) g_ptr_array_free (items, TRUE); /* Delete old table. */ - viewport = GTK_BIN (editor->priv->scrolled_window)->child; + viewport = gtk_bin_get_child (GTK_BIN (editor->priv->scrolled_window)); if (viewport) { gtk_container_remove (GTK_CONTAINER (viewport), - GTK_BIN (viewport)->child); + gtk_bin_get_child (GTK_BIN (viewport))); } /* Add table to window. */