[brasero] another attempt
Matthias Clasen
mclasen at fedoraproject.org
Wed Sep 22 16:50:24 UTC 2010
commit de6f5a0c71eabc715853271a2e2ae38bbfeda47d
Author: Matthias Clasen <mclasen at redhat.com>
Date: Wed Sep 22 12:47:04 2010 -0400
another attempt
gtk-build.patch | 103 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 75 insertions(+), 28 deletions(-)
---
diff --git a/gtk-build.patch b/gtk-build.patch
index e63350a..0f8bc7a 100644
--- a/gtk-build.patch
+++ b/gtk-build.patch
@@ -1,6 +1,6 @@
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
+--- brasero-2.31.92/libbrasero-burn/brasero-burn-dialog.c.gtk-build 2010-09-13 17:43:12.000000000 -0400
++++ brasero-2.31.92/libbrasero-burn/brasero-burn-dialog.c 2010-09-22 12:37:50.779998000 -0400
@@ -2561,8 +2561,6 @@ brasero_burn_dialog_init (BraseroBurnDia
gtk_window_set_default_size (GTK_WINDOW (obj), 500, 0);
@@ -11,8 +11,8 @@ diff -up brasero-2.31.92/libbrasero-burn/brasero-burn-dialog.c.gtk-build brasero
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
+--- brasero-2.31.92/libbrasero-burn/brasero-burn-options.c.gtk-build 2010-09-13 17:43:12.000000000 -0400
++++ brasero-2.31.92/libbrasero-burn/brasero-burn-options.c 2010-09-22 12:37:50.780998000 -0400
@@ -588,7 +588,6 @@ brasero_burn_options_valid_cb (BraseroSe
static void
brasero_burn_options_init (BraseroBurnOptions *object)
@@ -22,8 +22,8 @@ diff -up brasero-2.31.92/libbrasero-burn/brasero-burn-options.c.gtk-build braser
/**
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
+--- brasero-2.31.92/libbrasero-burn/brasero-image-properties.c.gtk-build 2010-09-13 17:42:52.000000000 -0400
++++ brasero-2.31.92/libbrasero-burn/brasero-image-properties.c 2010-09-22 12:37:51.170998001 -0400
@@ -474,8 +474,6 @@ brasero_image_properties_init (BraseroIm
priv = BRASERO_IMAGE_PROPERTIES_PRIVATE (object);
@@ -34,8 +34,8 @@ diff -up brasero-2.31.92/libbrasero-burn/brasero-image-properties.c.gtk-build br
gtk_container_set_border_width (GTK_CONTAINER (box), 10);
diff -up brasero-2.31.92/libbrasero-burn/brasero-medium-properties.c.gtk-build brasero-2.31.92/libbrasero-burn/brasero-medium-properties.c
---- brasero-2.31.92/libbrasero-burn/brasero-medium-properties.c.gtk-build 2010-09-22 11:48:18.868997989 -0400
-+++ brasero-2.31.92/libbrasero-burn/brasero-medium-properties.c 2010-09-22 11:48:36.767998000 -0400
+--- brasero-2.31.92/libbrasero-burn/brasero-medium-properties.c.gtk-build 2010-09-13 17:42:52.000000000 -0400
++++ brasero-2.31.92/libbrasero-burn/brasero-medium-properties.c 2010-09-22 12:37:51.355998000 -0400
@@ -97,7 +97,6 @@ brasero_medium_properties_drive_properti
dialog = gtk_dialog_new_with_buttons (header,
GTK_WINDOW (toplevel),
@@ -45,8 +45,8 @@ diff -up brasero-2.31.92/libbrasero-burn/brasero-medium-properties.c.gtk-build b
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
NULL);
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
+--- brasero-2.31.92/libbrasero-burn/brasero-tool-dialog.c.gtk-build 2010-09-13 17:42:52.000000000 -0400
++++ brasero-2.31.92/libbrasero-burn/brasero-tool-dialog.c 2010-09-22 12:37:51.543998000 -0400
@@ -529,8 +529,6 @@ brasero_tool_dialog_init (BraseroToolDia
priv = BRASERO_TOOL_DIALOG_PRIVATE (obj);
@@ -58,7 +58,7 @@ diff -up brasero-2.31.92/libbrasero-burn/brasero-tool-dialog.c.gtk-build brasero
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
++++ brasero-2.31.92/libbrasero-utils/brasero-jacket-buffer.c 2010-09-22 12:37:51.747997998 -0400
@@ -76,16 +76,12 @@ _gtk_text_attributes_fill_from_tags (Gtk
guint left_margin_accumulative = 0;
guint right_margin_accumulative = 0;
@@ -117,7 +117,7 @@ diff -up brasero-2.31.92/libbrasero-utils/brasero-jacket-buffer.c.gtk-build bras
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
++++ brasero-2.31.92/libbrasero-utils/brasero-jacket-edit.c 2010-09-22 12:37:52.265997999 -0400
@@ -837,8 +837,7 @@ brasero_jacket_edit_dialog_new (GtkWidge
window = gtk_dialog_new_with_buttons (_("Cover Editor"),
GTK_WINDOW (toplevel),
@@ -128,20 +128,40 @@ diff -up brasero-2.31.92/libbrasero-utils/brasero-jacket-edit.c.gtk-build braser
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
NULL);
+diff -up brasero-2.31.92/src/brasero-audio-disc.c.gtk-build brasero-2.31.92/src/brasero-audio-disc.c
+--- brasero-2.31.92/src/brasero-audio-disc.c.gtk-build 2010-09-22 12:40:55.561998000 -0400
++++ brasero-2.31.92/src/brasero-audio-disc.c 2010-09-22 12:41:37.999998004 -0400
+@@ -1974,10 +1974,10 @@ brasero_audio_disc_key_released_cb (GtkT
+ 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 -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);
-- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
-
- rename = brasero_rename_new ();
- brasero_rename_set_show_keep_default (BRASERO_RENAME (rename), FALSE);
+--- brasero-2.31.92/src/brasero-data-disc.c.gtk-build 2010-09-22 12:42:33.543997999 -0400
++++ brasero-2.31.92/src/brasero-data-disc.c 2010-09-22 12:42:53.798997998 -0400
+@@ -2242,9 +2242,9 @@ brasero_data_disc_key_released_cb (GtkTr
+ 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 -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
++++ brasero-2.31.92/src/brasero-eject-dialog.c 2010-09-22 12:37:52.699997999 -0400
@@ -156,7 +156,6 @@ brasero_eject_dialog_init (BraseroEjectD
priv = BRASERO_EJECT_DIALOG_PRIVATE (obj);
@@ -152,7 +172,7 @@ diff -up brasero-2.31.92/src/brasero-eject-dialog.c.gtk-build brasero-2.31.92/sr
priv->selector = brasero_drive_selection_new ();
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
++++ brasero-2.31.92/src/brasero-multi-song-props.c 2010-09-22 12:37:52.885998000 -0400
@@ -201,7 +201,6 @@ brasero_multi_song_props_init (BraseroMu
priv = BRASERO_MULTI_SONG_PROPS_PRIVATE (object);
@@ -163,7 +183,7 @@ diff -up brasero-2.31.92/src/brasero-multi-song-props.c.gtk-build brasero-2.31.9
gtk_window_set_default_size (GTK_WINDOW (object), 400, 200);
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
++++ brasero-2.31.92/src/brasero-plugin-option.c 2010-09-22 12:37:53.082997999 -0400
@@ -296,7 +296,6 @@ brasero_plugin_option_init (BraseroPlugi
FALSE,
0);
@@ -174,7 +194,7 @@ diff -up brasero-2.31.92/src/brasero-plugin-option.c.gtk-build brasero-2.31.92/s
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
++++ brasero-2.31.92/src/brasero-pref.c 2010-09-22 12:37:53.288997999 -0400
@@ -59,7 +59,6 @@ brasero_pref_init (BraseroPref *object)
priv = BRASERO_PREF_PRIVATE (object);
@@ -183,9 +203,20 @@ diff -up brasero-2.31.92/src/brasero-pref.c.gtk-build brasero-2.31.92/src/braser
gtk_window_set_default_size (GTK_WINDOW (object), 600, 400);
gtk_window_set_title (GTK_WINDOW (object), _("Brasero Plugins"));
+diff -up brasero-2.31.92/src/brasero-project.c.gtk-build brasero-2.31.92/src/brasero-project.c
+--- brasero-2.31.92/src/brasero-project.c.gtk-build 2010-09-22 12:41:52.806998000 -0400
++++ brasero-2.31.92/src/brasero-project.c 2010-09-22 12:42:03.539998000 -0400
+@@ -1496,7 +1496,6 @@ brasero_project_drive_properties (Braser
+ 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 -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
++++ brasero-2.31.92/src/brasero-song-properties.c 2010-09-22 12:37:53.539997999 -0400
@@ -153,7 +153,6 @@ brasero_song_props_init (BraseroSongProp
GtkWidget *content_area;
@@ -196,7 +227,7 @@ diff -up brasero-2.31.92/src/brasero-song-properties.c.gtk-build brasero-2.31.92
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
++++ brasero-2.31.92/src/brasero-split-dialog.c 2010-09-22 12:37:57.709998000 -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);
@@ -206,3 +237,19 @@ diff -up brasero-2.31.92/src/brasero-split-dialog.c.gtk-build brasero-2.31.92/sr
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 -up brasero-2.31.92/src/brasero-video-disc.c.gtk-build brasero-2.31.92/src/brasero-video-disc.c
+--- brasero-2.31.92/src/brasero-video-disc.c.gtk-build 2010-09-22 12:43:33.559997999 -0400
++++ brasero-2.31.92/src/brasero-video-disc.c 2010-09-22 12:45:30.446997998 -0400
+@@ -1143,10 +1143,10 @@ brasero_video_disc_key_released_cb (GtkT
+ 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;
More information about the scm-commits
mailing list