[brasero] try again
Matthias Clasen
mclasen at fedoraproject.org
Wed Sep 22 15:36:36 UTC 2010
commit b3f6ee29ee09be4e88bbc08d2a067d0dbe69e73f
Author: Matthias Clasen <mclasen at redhat.com>
Date: Wed Sep 22 11:35:16 2010 -0400
try again
gtk-build.patch | 116 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 86 insertions(+), 30 deletions(-)
---
diff --git a/gtk-build.patch b/gtk-build.patch
index 674aa23..5dac512 100644
--- a/gtk-build.patch
+++ b/gtk-build.patch
@@ -1,6 +1,54 @@
---- brasero-2.31.92/libbrasero-utils/brasero-jacket-buffer.c 2010-09-13 18:27:15.000000000 -0400
-+++ hacked/libbrasero-utils/brasero-jacket-buffer.c 2010-09-22 09:31:27.139998002 -0400
-@@ -76,16 +76,12 @@
+diff -up brasero-2.31.92/libbrasero-burn/brasero-burn-dialog.c.gtk-build brasero-2.31.92/libbrasero-burn/brasero-burn-dialog.c
+--- brasero-2.31.92/libbrasero-burn/brasero-burn-dialog.c.gtk-build 2010-09-22 11:33:50.923998000 -0400
++++ brasero-2.31.92/libbrasero-burn/brasero-burn-dialog.c 2010-09-22 11:34:42.245997999 -0400
+@@ -2561,8 +2561,6 @@ brasero_burn_dialog_init (BraseroBurnDia
+
+ 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 -up brasero-2.31.92/libbrasero-burn/brasero-burn-options.c.gtk-build brasero-2.31.92/libbrasero-burn/brasero-burn-options.c
+--- brasero-2.31.92/libbrasero-burn/brasero-burn-options.c.gtk-build 2010-09-22 11:34:02.380997999 -0400
++++ brasero-2.31.92/libbrasero-burn/brasero-burn-options.c 2010-09-22 11:34:46.137998000 -0400
+@@ -588,7 +588,6 @@ brasero_burn_options_valid_cb (BraseroSe
+ static void
+ brasero_burn_options_init (BraseroBurnOptions *object)
+ {
+- gtk_dialog_set_has_separator (GTK_DIALOG (object), FALSE);
+ }
+
+ /**
+diff -up brasero-2.31.92/libbrasero-burn/brasero-image-properties.c.gtk-build brasero-2.31.92/libbrasero-burn/brasero-image-properties.c
+--- brasero-2.31.92/libbrasero-burn/brasero-image-properties.c.gtk-build 2010-09-22 11:34:13.034997999 -0400
++++ brasero-2.31.92/libbrasero-burn/brasero-image-properties.c 2010-09-22 11:34:50.614998000 -0400
+@@ -474,8 +474,6 @@ brasero_image_properties_init (BraseroIm
+ 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 -up brasero-2.31.92/libbrasero-burn/brasero-tool-dialog.c.gtk-build brasero-2.31.92/libbrasero-burn/brasero-tool-dialog.c
+--- brasero-2.31.92/libbrasero-burn/brasero-tool-dialog.c.gtk-build 2010-09-22 11:34:21.522998000 -0400
++++ brasero-2.31.92/libbrasero-burn/brasero-tool-dialog.c 2010-09-22 11:34:54.849997999 -0400
+@@ -529,8 +529,6 @@ brasero_tool_dialog_init (BraseroToolDia
+
+ 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 -up brasero-2.31.92/libbrasero-utils/brasero-jacket-buffer.c.gtk-build brasero-2.31.92/libbrasero-utils/brasero-jacket-buffer.c
+--- brasero-2.31.92/libbrasero-utils/brasero-jacket-buffer.c.gtk-build 2010-09-13 18:27:15.000000000 -0400
++++ brasero-2.31.92/libbrasero-utils/brasero-jacket-buffer.c 2010-09-22 11:33:12.789997999 -0400
+@@ -76,16 +76,12 @@ _gtk_text_attributes_fill_from_tags (Gtk
guint left_margin_accumulative = 0;
guint right_margin_accumulative = 0;
@@ -17,7 +65,7 @@
gboolean scale_set;
gboolean left_margin_set;
gboolean justification_set;
-@@ -113,8 +109,6 @@
+@@ -113,8 +109,6 @@ _gtk_text_attributes_fill_from_tags (Gtk
"background-set", &background_set,
"foreground-set", &fg_color_set,
"paragraph-background-set", &pg_bg_color_set,
@@ -26,7 +74,7 @@
"scale-set", &scale_set,
"left-margin-set", &left_margin_set,
"justification-set", &justification_set,
-@@ -161,20 +155,6 @@
+@@ -161,20 +155,6 @@ _gtk_text_attributes_fill_from_tags (Gtk
g_object_get (tag, "paragraph-background-gdk", &dest->pg_bg_color, NULL);
}
@@ -47,7 +95,7 @@
if (font_desc) {
if (dest->font) {
pango_font_description_merge (dest->font, font_desc, TRUE);
-@@ -187,7 +167,7 @@
+@@ -187,7 +167,7 @@ _gtk_text_attributes_fill_from_tags (Gtk
/* multiply all the scales together to get a composite */
if (scale_set) {
gdouble font_scale;
@@ -56,9 +104,10 @@
dest->font_scale *= font_scale;
}
---- brasero-2.31.92/libbrasero-utils/brasero-jacket-edit.c 2010-09-13 18:27:15.000000000 -0400
-+++ hacked/libbrasero-utils/brasero-jacket-edit.c 2010-09-22 09:33:13.807998006 -0400
-@@ -837,8 +837,7 @@
+diff -up brasero-2.31.92/libbrasero-utils/brasero-jacket-edit.c.gtk-build brasero-2.31.92/libbrasero-utils/brasero-jacket-edit.c
+--- brasero-2.31.92/libbrasero-utils/brasero-jacket-edit.c.gtk-build 2010-09-13 18:27:15.000000000 -0400
++++ brasero-2.31.92/libbrasero-utils/brasero-jacket-edit.c 2010-09-22 11:33:12.792997999 -0400
+@@ -837,8 +837,7 @@ brasero_jacket_edit_dialog_new (GtkWidge
window = gtk_dialog_new_with_buttons (_("Cover Editor"),
GTK_WINDOW (toplevel),
GTK_DIALOG_MODAL|
@@ -68,9 +117,10 @@
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
NULL);
---- brasero-2.31.92/src/brasero-data-disc.c 2010-09-13 17:43:12.000000000 -0400
-+++ hacked/src/brasero-data-disc.c 2010-09-22 10:56:26.105997992 -0400
-@@ -1921,7 +1921,6 @@
+diff -up brasero-2.31.92/src/brasero-data-disc.c.gtk-build brasero-2.31.92/src/brasero-data-disc.c
+--- brasero-2.31.92/src/brasero-data-disc.c.gtk-build 2010-09-13 17:43:12.000000000 -0400
++++ brasero-2.31.92/src/brasero-data-disc.c 2010-09-22 11:33:12.795997999 -0400
+@@ -1921,7 +1921,6 @@ brasero_data_disc_rename_activated (Bras
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
_("_Rename"), GTK_RESPONSE_APPLY,
NULL);
@@ -78,9 +128,10 @@
rename = brasero_rename_new ();
brasero_rename_set_show_keep_default (BRASERO_RENAME (rename), FALSE);
---- brasero-2.31.92/src/brasero-eject-dialog.c 2010-09-13 17:42:52.000000000 -0400
-+++ hacked/src/brasero-eject-dialog.c 2010-09-22 10:56:41.050998000 -0400
-@@ -156,7 +156,6 @@
+diff -up brasero-2.31.92/src/brasero-eject-dialog.c.gtk-build brasero-2.31.92/src/brasero-eject-dialog.c
+--- brasero-2.31.92/src/brasero-eject-dialog.c.gtk-build 2010-09-13 17:42:52.000000000 -0400
++++ brasero-2.31.92/src/brasero-eject-dialog.c 2010-09-22 11:33:12.798997999 -0400
+@@ -156,7 +156,6 @@ brasero_eject_dialog_init (BraseroEjectD
priv = BRASERO_EJECT_DIALOG_PRIVATE (obj);
@@ -88,9 +139,10 @@
box = gtk_dialog_get_content_area (GTK_DIALOG (obj));
priv->selector = brasero_drive_selection_new ();
---- brasero-2.31.92/src/brasero-multi-song-props.c 2010-09-13 17:42:52.000000000 -0400
-+++ hacked/src/brasero-multi-song-props.c 2010-09-22 10:56:44.018997999 -0400
-@@ -201,7 +201,6 @@
+diff -up brasero-2.31.92/src/brasero-multi-song-props.c.gtk-build brasero-2.31.92/src/brasero-multi-song-props.c
+--- brasero-2.31.92/src/brasero-multi-song-props.c.gtk-build 2010-09-13 17:42:52.000000000 -0400
++++ brasero-2.31.92/src/brasero-multi-song-props.c 2010-09-22 11:33:12.799997999 -0400
+@@ -201,7 +201,6 @@ brasero_multi_song_props_init (BraseroMu
priv = BRASERO_MULTI_SONG_PROPS_PRIVATE (object);
@@ -98,9 +150,10 @@
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);
---- brasero-2.31.92/src/brasero-plugin-option.c 2010-09-13 17:43:12.000000000 -0400
-+++ hacked/src/brasero-plugin-option.c 2010-09-22 10:56:46.145998000 -0400
-@@ -296,7 +296,6 @@
+diff -up brasero-2.31.92/src/brasero-plugin-option.c.gtk-build brasero-2.31.92/src/brasero-plugin-option.c
+--- brasero-2.31.92/src/brasero-plugin-option.c.gtk-build 2010-09-13 17:43:12.000000000 -0400
++++ brasero-2.31.92/src/brasero-plugin-option.c 2010-09-22 11:33:12.800997999 -0400
+@@ -296,7 +296,6 @@ brasero_plugin_option_init (BraseroPlugi
FALSE,
0);
@@ -108,9 +161,10 @@
gtk_dialog_add_button (GTK_DIALOG (object),
GTK_STOCK_CLOSE, GTK_RESPONSE_OK);
---- brasero-2.31.92/src/brasero-pref.c 2010-09-13 17:42:52.000000000 -0400
-+++ hacked/src/brasero-pref.c 2010-09-22 10:56:52.056998000 -0400
-@@ -59,7 +59,6 @@
+diff -up brasero-2.31.92/src/brasero-pref.c.gtk-build brasero-2.31.92/src/brasero-pref.c
+--- brasero-2.31.92/src/brasero-pref.c.gtk-build 2010-09-13 17:42:52.000000000 -0400
++++ brasero-2.31.92/src/brasero-pref.c 2010-09-22 11:33:12.801997999 -0400
+@@ -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);
@@ -118,9 +172,10 @@
gtk_window_set_default_size (GTK_WINDOW (object), 600, 400);
gtk_window_set_title (GTK_WINDOW (object), _("Brasero Plugins"));
---- brasero-2.31.92/src/brasero-song-properties.c 2010-09-13 17:42:52.000000000 -0400
-+++ hacked/src/brasero-song-properties.c 2010-09-22 10:56:56.424998011 -0400
-@@ -153,7 +153,6 @@
+diff -up brasero-2.31.92/src/brasero-song-properties.c.gtk-build brasero-2.31.92/src/brasero-song-properties.c
+--- brasero-2.31.92/src/brasero-song-properties.c.gtk-build 2010-09-13 17:42:52.000000000 -0400
++++ brasero-2.31.92/src/brasero-song-properties.c 2010-09-22 11:33:12.803997999 -0400
+@@ -153,7 +153,6 @@ brasero_song_props_init (BraseroSongProp
GtkWidget *content_area;
obj->priv = g_new0 (BraseroSongPropsPrivate, 1);
@@ -128,9 +183,10 @@
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);
---- brasero-2.31.92/src/brasero-split-dialog.c 2010-09-13 17:43:12.000000000 -0400
-+++ hacked/src/brasero-split-dialog.c 2010-09-22 10:57:01.935998018 -0400
-@@ -1053,8 +1053,6 @@
+diff -up brasero-2.31.92/src/brasero-split-dialog.c.gtk-build brasero-2.31.92/src/brasero-split-dialog.c
+--- brasero-2.31.92/src/brasero-split-dialog.c.gtk-build 2010-09-13 17:43:12.000000000 -0400
++++ brasero-2.31.92/src/brasero-split-dialog.c 2010-09-22 11:33:12.804997999 -0400
+@@ -1053,8 +1053,6 @@ brasero_split_dialog_init (BraseroSplitD
gtk_window_set_title (GTK_WINDOW (object), _("Split Track"));
gtk_window_set_default_size (GTK_WINDOW (object), 500, 600);
More information about the scm-commits
mailing list