GNOME.org
 

[brasero/gnome-2-32] Fix #630178 - Deprecation of gtk_dialog_set_has_separator() in GTK+ 2.21.8 Patch by Matthias Clasen

commit 164e728a908c07e92091758b9f11483206288b1e
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date:   Wed Sep 22 21:39:32 2010 +0200

    Fix #630178 - Deprecation of gtk_dialog_set_has_separator() in GTK+ 2.21.8
    Patch by Matthias Clasen

 libbrasero-burn/brasero-burn-dialog.c       |    2 --
 libbrasero-burn/brasero-burn-options.c      |    1 -
 libbrasero-burn/brasero-image-properties.c  |    2 --
 libbrasero-burn/brasero-medium-properties.c |    1 -
 libbrasero-burn/brasero-tool-dialog.c       |    2 --
 libbrasero-utils/brasero-jacket-buffer.c    |   22 +---------------------
 libbrasero-utils/brasero-jacket-edit.c      |    3 +--
 src/brasero-audio-disc.c                    |    4 ++--
 src/brasero-data-disc.c                     |    4 ++--
 src/brasero-eject-dialog.c                  |    1 -
 src/brasero-multi-song-props.c              |    1 -
 src/brasero-plugin-option.c                 |    1 -
 src/brasero-pref.c                          |    1 -
 src/brasero-project.c                       |    1 -
 src/brasero-song-properties.c               |    1 -
 src/brasero-split-dialog.c                  |    2 --
 src/brasero-video-disc.c                    |    4 ++--
 17 files changed, 8 insertions(+), 45 deletions(-)
---
diff --git a/libbrasero-burn/brasero-burn-dialog.c b/libbrasero-burn/brasero-burn-dialog.c
index d569020..d9e156d 100644
--- a/libbrasero-burn/brasero-burn-dialog.c
+++ b/libbrasero-burn/brasero-burn-dialog.c
@@ -2561,8 +2561,6 @@ brasero_burn_dialog_init (BraseroBurnDialog * obj)
 
 	gtk_window_set_default_size (GTK_WINDOW (obj), 500, 0);
 
-	gtk_dialog_set_has_separator (GTK_DIALOG (obj), FALSE);
-
 	priv->tray = brasero_tray_icon_new ();
 	g_signal_connect (priv->tray,
 			  "cancel",
diff --git a/libbrasero-burn/brasero-burn-options.c b/libbrasero-burn/brasero-burn-options.c
index 9e3b2cd..ec1b0ec 100644
--- a/libbrasero-burn/brasero-burn-options.c
+++ b/libbrasero-burn/brasero-burn-options.c
@@ -588,7 +588,6 @@ brasero_burn_options_valid_cb (BraseroSessionCfg *session,
 static void
 brasero_burn_options_init (BraseroBurnOptions *object)
 {
-	gtk_dialog_set_has_separator (GTK_DIALOG (object), FALSE);
 }
 
 /**
diff --git a/libbrasero-burn/brasero-image-properties.c b/libbrasero-burn/brasero-image-properties.c
index e550d23..0f88914 100644
--- a/libbrasero-burn/brasero-image-properties.c
+++ b/libbrasero-burn/brasero-image-properties.c
@@ -474,8 +474,6 @@ brasero_image_properties_init (BraseroImageProperties *object)
 	priv = BRASERO_IMAGE_PROPERTIES_PRIVATE (object);
 
 	gtk_window_set_title (GTK_WINDOW (object), _("Location for Image File"));
-	gtk_dialog_set_has_separator (GTK_DIALOG (object), FALSE);
-
 	box = gtk_dialog_get_content_area (GTK_DIALOG (object));
 	gtk_container_set_border_width (GTK_CONTAINER (box), 10);
 
diff --git a/libbrasero-burn/brasero-medium-properties.c b/libbrasero-burn/brasero-medium-properties.c
index 4c64c55..6dfae3e 100644
--- a/libbrasero-burn/brasero-medium-properties.c
+++ b/libbrasero-burn/brasero-medium-properties.c
@@ -97,7 +97,6 @@ brasero_medium_properties_drive_properties (BraseroMediumProperties *self)
 	dialog = gtk_dialog_new_with_buttons (header,
 					      GTK_WINDOW (toplevel),
 					      GTK_DIALOG_MODAL|
-					      GTK_DIALOG_NO_SEPARATOR|
 					      GTK_DIALOG_DESTROY_WITH_PARENT,
 					      GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
 					      NULL);
diff --git a/libbrasero-burn/brasero-tool-dialog.c b/libbrasero-burn/brasero-tool-dialog.c
index b90cc21..1e6f2b9 100644
--- a/libbrasero-burn/brasero-tool-dialog.c
+++ b/libbrasero-burn/brasero-tool-dialog.c
@@ -529,8 +529,6 @@ brasero_tool_dialog_init (BraseroToolDialog *obj)
 
 	priv = BRASERO_TOOL_DIALOG_PRIVATE (obj);
 
-	gtk_dialog_set_has_separator (GTK_DIALOG (obj), FALSE);
-
 	/* upper part */
 	priv->upper_box = gtk_vbox_new (FALSE, 0);
 	gtk_widget_show (GTK_WIDGET (priv->upper_box));
diff --git a/libbrasero-utils/brasero-jacket-buffer.c b/libbrasero-utils/brasero-jacket-buffer.c
index 828ccf1..5aeff5e 100644
--- a/libbrasero-utils/brasero-jacket-buffer.c
+++ b/libbrasero-utils/brasero-jacket-buffer.c
@@ -76,16 +76,12 @@ _gtk_text_attributes_fill_from_tags (GtkTextAttributes *dest,
 	guint left_margin_accumulative = 0;
 	guint right_margin_accumulative = 0;
 
-	g_return_if_fail (!dest->realized);
-
 	for (; tags; tags = tags->next) {
 		GtkTextTag *tag;
 		gboolean accumulative_margin;
 		gboolean background_set;
 		gboolean fg_color_set;
 		gboolean pg_bg_color_set;
-		gboolean bg_stipple_set;
-		gboolean fg_stipple_set;
 		gboolean scale_set;
 		gboolean left_margin_set;
 		gboolean justification_set;
@@ -113,8 +109,6 @@ _gtk_text_attributes_fill_from_tags (GtkTextAttributes *dest,
 		              "background-set", &background_set,
 		              "foreground-set", &fg_color_set,
 		              "paragraph-background-set", &pg_bg_color_set,
-		              "background-stipple-set", &bg_stipple_set,
-		              "foreground-stipple-set", &fg_stipple_set,
 		              "scale-set", &scale_set,
 		              "left-margin-set", &left_margin_set,
 		              "justification-set", &justification_set,
@@ -161,20 +155,6 @@ _gtk_text_attributes_fill_from_tags (GtkTextAttributes *dest,
 			g_object_get (tag, "paragraph-background-gdk", &dest->pg_bg_color, NULL);
 		}
 
-		if (bg_stipple_set) {
-			if (dest->appearance.bg_stipple)
-				g_object_unref (dest->appearance.bg_stipple);
-			g_object_get (tag, "background-stipple", &dest->appearance.bg_stipple, NULL);
-
-			dest->appearance.draw_bg = TRUE;
-		}
-
-		if (fg_stipple_set) {
-			if (dest->appearance.fg_stipple)
-				g_object_unref (dest->appearance.fg_stipple);
-			g_object_get (tag, "foreground-stipple", &dest->appearance.fg_stipple, NULL);
-		}
-
 		if (font_desc) {
 			if (dest->font) {
 				pango_font_description_merge (dest->font, font_desc, TRUE);
@@ -187,7 +167,7 @@ _gtk_text_attributes_fill_from_tags (GtkTextAttributes *dest,
 		/* multiply all the scales together to get a composite */
 		if (scale_set) {
 			gdouble font_scale;
-			g_object_get (tag, "foreground-stipple", &font_scale, NULL);
+			g_object_get (tag, "font-scale", &font_scale, NULL);
 			dest->font_scale *= font_scale;
 		}
 
diff --git a/libbrasero-utils/brasero-jacket-edit.c b/libbrasero-utils/brasero-jacket-edit.c
index 00282a6..b2760e8 100644
--- a/libbrasero-utils/brasero-jacket-edit.c
+++ b/libbrasero-utils/brasero-jacket-edit.c
@@ -837,8 +837,7 @@ brasero_jacket_edit_dialog_new (GtkWidget *toplevel,
 	window = gtk_dialog_new_with_buttons (_("Cover Editor"),
 					      GTK_WINDOW (toplevel),
 					      GTK_DIALOG_MODAL|
-					      GTK_DIALOG_DESTROY_WITH_PARENT|
-					      GTK_DIALOG_NO_SEPARATOR,
+					      GTK_DIALOG_DESTROY_WITH_PARENT,
 					      GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
 					      NULL);
 
diff --git a/src/brasero-audio-disc.c b/src/brasero-audio-disc.c
index 36d2f50..70439f5 100644
--- a/src/brasero-audio-disc.c
+++ b/src/brasero-audio-disc.c
@@ -1974,10 +1974,10 @@ brasero_audio_disc_key_released_cb (GtkTreeView *tree,
 	if (disc->priv->editing)
 		return FALSE;
 
-	if (event->keyval == GDK_KP_Delete || event->keyval == GDK_Delete) {
+	if (event->keyval == GDK_KEY_KP_Delete || event->keyval == GDK_KEY_Delete) {
 		brasero_audio_disc_delete_selected (BRASERO_DISC (disc));
 	}
-	else if (event->keyval == GDK_F2)
+	else if (event->keyval == GDK_KEY_F2)
 		brasero_audio_disc_rename_activated (disc);
 
 	return FALSE;
diff --git a/src/brasero-data-disc.c b/src/brasero-data-disc.c
index 8f1b031..89f427d 100644
--- a/src/brasero-data-disc.c
+++ b/src/brasero-data-disc.c
@@ -2243,9 +2243,9 @@ brasero_data_disc_key_released_cb (GtkTreeView *tree,
 	if (priv->editing)
 		return FALSE;
 
-	if (event->keyval == GDK_KP_Delete || event->keyval == GDK_Delete)
+	if (event->keyval == GDK_KEY_KP_Delete || event->keyval == GDK_KEY_Delete)
 		brasero_data_disc_delete_selected (BRASERO_DISC (self));
-	else if (event->keyval == GDK_F2)
+	else if (event->keyval == GDK_KEY_F2)
 		brasero_data_disc_rename_activated (self);
 
 	return FALSE;
diff --git a/src/brasero-eject-dialog.c b/src/brasero-eject-dialog.c
index 015f1e1..09b3469 100644
--- a/src/brasero-eject-dialog.c
+++ b/src/brasero-eject-dialog.c
@@ -156,7 +156,6 @@ brasero_eject_dialog_init (BraseroEjectDialog *obj)
 
 	priv = BRASERO_EJECT_DIALOG_PRIVATE (obj);
 
-	gtk_dialog_set_has_separator (GTK_DIALOG (obj), FALSE);
 	box = gtk_dialog_get_content_area (GTK_DIALOG (obj));
 
 	priv->selector = brasero_drive_selection_new ();
diff --git a/src/brasero-multi-song-props.c b/src/brasero-multi-song-props.c
index d71d8cd..ea9a9bb 100644
--- a/src/brasero-multi-song-props.c
+++ b/src/brasero-multi-song-props.c
@@ -201,7 +201,6 @@ brasero_multi_song_props_init (BraseroMultiSongProps *object)
 
 	priv = BRASERO_MULTI_SONG_PROPS_PRIVATE (object);
 
-	gtk_dialog_set_has_separator (GTK_DIALOG (object), FALSE);
 	content_area = gtk_dialog_get_content_area (GTK_DIALOG (object));
 	gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (object))), 0);
 	gtk_window_set_default_size (GTK_WINDOW (object), 400, 200);
diff --git a/src/brasero-plugin-option.c b/src/brasero-plugin-option.c
index 331b75f..7b7b49b 100644
--- a/src/brasero-plugin-option.c
+++ b/src/brasero-plugin-option.c
@@ -296,7 +296,6 @@ brasero_plugin_option_init (BraseroPluginOption *object)
 			    FALSE,
 			    0);
 
-	gtk_dialog_set_has_separator (GTK_DIALOG (object), FALSE);
 	gtk_dialog_add_button (GTK_DIALOG (object),
 			       GTK_STOCK_CLOSE, GTK_RESPONSE_OK);
 
diff --git a/src/brasero-pref.c b/src/brasero-pref.c
index b82fe34..06db48c 100644
--- a/src/brasero-pref.c
+++ b/src/brasero-pref.c
@@ -59,7 +59,6 @@ brasero_pref_init (BraseroPref *object)
 	priv = BRASERO_PREF_PRIVATE (object);
 
 	gtk_dialog_add_button (GTK_DIALOG (object), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
-	gtk_dialog_set_has_separator (GTK_DIALOG (object), FALSE);
 
 	gtk_window_set_default_size (GTK_WINDOW (object), 600, 400);
 	gtk_window_set_title (GTK_WINDOW (object), _("Brasero Plugins"));
diff --git a/src/brasero-project.c b/src/brasero-project.c
index d4d9108..d0f3871 100644
--- a/src/brasero-project.c
+++ b/src/brasero-project.c
@@ -1496,7 +1496,6 @@ brasero_project_drive_properties (BraseroProject *project)
 	dialog = gtk_dialog_new_with_buttons (header,
 					      NULL,
 					      GTK_DIALOG_MODAL|
-					      GTK_DIALOG_NO_SEPARATOR|
 					      GTK_DIALOG_DESTROY_WITH_PARENT,
 					      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 					      NULL);
diff --git a/src/brasero-song-properties.c b/src/brasero-song-properties.c
index 94e67f5..ebbdc32 100644
--- a/src/brasero-song-properties.c
+++ b/src/brasero-song-properties.c
@@ -153,7 +153,6 @@ brasero_song_props_init (BraseroSongProps *obj)
 	GtkWidget *content_area;
 
 	obj->priv = g_new0 (BraseroSongPropsPrivate, 1);
-	gtk_dialog_set_has_separator (GTK_DIALOG (obj), FALSE);
 	gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (obj))), 0);
 	gtk_window_set_default_size (GTK_WINDOW (obj), 400, 300);
 
diff --git a/src/brasero-split-dialog.c b/src/brasero-split-dialog.c
index b7924c7..45fa373 100644
--- a/src/brasero-split-dialog.c
+++ b/src/brasero-split-dialog.c
@@ -1053,8 +1053,6 @@ brasero_split_dialog_init (BraseroSplitDialog *object)
 	gtk_window_set_title (GTK_WINDOW (object), _("Split Track"));
 	gtk_window_set_default_size (GTK_WINDOW (object), 500, 600);
 
-	gtk_dialog_set_has_separator (GTK_DIALOG (object), FALSE);
-
 	gtk_dialog_add_button (GTK_DIALOG (object), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
 	gtk_dialog_add_button (GTK_DIALOG (object), GTK_STOCK_OK, GTK_RESPONSE_OK);
 
diff --git a/src/brasero-video-disc.c b/src/brasero-video-disc.c
index 72b99d1..969a606 100644
--- a/src/brasero-video-disc.c
+++ b/src/brasero-video-disc.c
@@ -1143,10 +1143,10 @@ brasero_video_disc_key_released_cb (GtkTreeView *tree,
 	if (priv->editing)
 		return FALSE;
 
-	if (event->keyval == GDK_KP_Delete || event->keyval == GDK_Delete) {
+	if (event->keyval == GDK_KEY_KP_Delete || event->keyval == GDK_KEY_Delete) {
 		brasero_video_disc_delete_selected (BRASERO_DISC (self));
 	}
-	else if (event->keyval == GDK_F2)
+	else if (event->keyval == GDK_KEY_F2)
 		brasero_video_disc_rename_activated (self);
 
 	return FALSE;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]