[brasero] Use accessor functions instead direct access. Final patch



commit 7d79bbdf0548f1180f85c1713b4bba48c2d54dd9
Author: Javier Jardón <jjardon gnome org>
Date:   Wed May 12 00:56:03 2010 +0200

    Use accessor functions instead direct access. Final patch
    
    Also, added -DGSEAL_ENABLE to configure.in to not use direct
    access again.
    
    Fixes https://bugzilla.gnome.org/show_bug.cgi?id=594716

 configure.in                           |    2 ++
 libbrasero-burn/brasero-burn-dialog.c  |    2 +-
 libbrasero-burn/brasero-burn-options.c |    2 +-
 src/brasero-file-chooser.c             |    6 +++---
 src/brasero-project.c                  |    2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/configure.in b/configure.in
index 84318ae..8b4d8e2 100644
--- a/configure.in
+++ b/configure.in
@@ -65,6 +65,8 @@ dnl This could be use one day not to compile all debugging message
 dnl GNOME_DEBUG_CHECK
 
 GNOME_MAINTAINER_MODE_DEFINES
+DISABLE_DEPRECATED="$DISABLE_DEPRECATED -DGSEAL_ENABLE"
+AC_SUBST(DISABLE_DEPRECATED)
 
 dnl ***************** GENERAL **********************************
 
diff --git a/libbrasero-burn/brasero-burn-dialog.c b/libbrasero-burn/brasero-burn-dialog.c
index 26d9189..4287e0d 100644
--- a/libbrasero-burn/brasero-burn-dialog.c
+++ b/libbrasero-burn/brasero-burn-dialog.c
@@ -2540,7 +2540,7 @@ brasero_burn_dialog_init (BraseroBurnDialog * obj)
 	alignment = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
 	gtk_widget_show (alignment);
 	gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 6, 8, 6, 6);
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (obj)->vbox),
+	gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (obj))),
 			    alignment,
 			    TRUE,
 			    TRUE,
diff --git a/libbrasero-burn/brasero-burn-options.c b/libbrasero-burn/brasero-burn-options.c
index db61e3d..7d91841 100644
--- a/libbrasero-burn/brasero-burn-options.c
+++ b/libbrasero-burn/brasero-burn-options.c
@@ -1132,7 +1132,7 @@ brasero_burn_options_install_missing (BraseroPluginErrorType type,
 	int xid = 0;
 
 	/* Get the xid */
-	xid = gdk_x11_drawable_get_xid (GDK_DRAWABLE (GTK_WIDGET (user_data)->window));
+	xid = gdk_x11_drawable_get_xid (GDK_DRAWABLE (gtk_widget_get_window (GTK_WIDGET (user_data))));
 
 	package = brasero_pk_new ();
 	cancel = g_cancellable_new ();
diff --git a/src/brasero-file-chooser.c b/src/brasero-file-chooser.c
index 3333ad7..033722b 100644
--- a/src/brasero-file-chooser.c
+++ b/src/brasero-file-chooser.c
@@ -245,13 +245,13 @@ brasero_file_chooser_customize (GtkWidget *widget, gpointer null_data)
 		&& (!strcmp (stock_id,GTK_STOCK_ADD)
 		||  !strcmp (stock_id, GTK_STOCK_REMOVE))) {
 			GtkRequisition request;
-			gint width, height;
+			gint width;
 			GtkWidget *parent;
 
 			/* This is to avoid having the left part too small */
 			parent = gtk_widget_get_parent (widget);
-			width = parent->requisition.width;
-			height = parent->requisition.height;
+			gtk_widget_get_requisition (parent, &request);
+			width = request.width;
 			gtk_widget_size_request (parent, &request);
 			if (request.width >= width)
 				gtk_widget_set_size_request (parent,
diff --git a/src/brasero-project.c b/src/brasero-project.c
index ffd3f51..e58ab20 100644
--- a/src/brasero-project.c
+++ b/src/brasero-project.c
@@ -1319,7 +1319,7 @@ brasero_project_install_missing (BraseroPluginErrorType type,
 
 	/* Get the xid */
 	parent = gtk_widget_get_toplevel (GTK_WIDGET (project));
-	xid = gdk_x11_drawable_get_xid (GDK_DRAWABLE (GTK_WIDGET (parent)->window));
+	xid = gdk_x11_drawable_get_xid (GDK_DRAWABLE (gtk_widget_get_window (parent)));
 
 	package = brasero_pk_new ();
 	cancel = g_cancellable_new ();



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]