- Fix GTK+ name in pkg-config file
This commit is contained in:
Bastien Nocera
parent
dba79301f1
commit
cf80c25f64
38
0001-Fix-Bug-641407-libbrasero-media3.pc-doesn-t-work.patch
Normal file
38
0001-Fix-Bug-641407-libbrasero-media3.pc-doesn-t-work.patch
Normal file
@ -0,0 +1,38 @@
|
||||
From 218df5b7fc3c713ffcdf7f3709aab0171c75a473 Mon Sep 17 00:00:00 2001
|
||||
From: Luis Medinas <lmedinas@gnome.org>
|
||||
Date: Sat, 5 Feb 2011 16:55:10 +0000
|
||||
Subject: [PATCH] Fix Bug 641407 - libbrasero-media3.pc doesn't work
|
||||
|
||||
Libbrasero-media3 and libbrasero-burn3 had a typo in gtk+-3.0 call.
|
||||
---
|
||||
libbrasero-burn3.pc.in | 2 +-
|
||||
libbrasero-media3.pc.in | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/libbrasero-burn3.pc.in b/libbrasero-burn3.pc.in
|
||||
index 456ba00..2937efe 100644
|
||||
--- a/libbrasero-burn3.pc.in
|
||||
+++ b/libbrasero-burn3.pc.in
|
||||
@@ -7,6 +7,6 @@ includedir=@includedir@
|
||||
Name: libbrasero-burn
|
||||
Description: Brasero Optical Media Burning library
|
||||
Version: @VERSION@
|
||||
-Requires: glib-2.0 gthread-2.0 gtk+-3
|
||||
+Requires: glib-2.0 gthread-2.0 gtk+-3.0
|
||||
Libs: -L${libdir} -lbrasero-burn3
|
||||
Cflags: -I${includedir}/brasero3
|
||||
diff --git a/libbrasero-media3.pc.in b/libbrasero-media3.pc.in
|
||||
index aacddc7..5f303f8 100644
|
||||
--- a/libbrasero-media3.pc.in
|
||||
+++ b/libbrasero-media3.pc.in
|
||||
@@ -7,6 +7,6 @@ includedir=@includedir@
|
||||
Name: libbrasero-media
|
||||
Description: Brasero Optical Media library
|
||||
Version: @VERSION@
|
||||
-Requires: glib-2.0 gthread-2.0 gtk+-3
|
||||
+Requires: glib-2.0 gthread-2.0 gtk+-3.0
|
||||
Libs: -L${libdir} -lbrasero-media3
|
||||
Cflags: -I${includedir}/brasero3
|
||||
--
|
||||
1.7.4
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
Name: brasero
|
||||
Version: 2.91.6
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: Gnome CD/DVD burning application
|
||||
Group: Applications/Multimedia
|
||||
License: GPLv2+
|
||||
@ -14,6 +14,8 @@ URL: http://www.gnome.org/projects/brasero/
|
||||
#VCS: git:git://git.gnome.org/brasero
|
||||
Source0: http://ftp.gnome.org/pub/GNOME/sources/brasero/2.91/%{name}-%{version}.tar.bz2
|
||||
|
||||
Patch0: 0001-Fix-Bug-641407-libbrasero-media3.pc-doesn-t-work.patch
|
||||
|
||||
BuildRequires: gtk3-devel >= 2.99.0
|
||||
BuildRequires: glib2-devel >= 2.15.6
|
||||
BuildRequires: GConf2-devel
|
||||
@ -98,6 +100,7 @@ developing brasero applications.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1 -b .gtk-name
|
||||
|
||||
%build
|
||||
%configure \
|
||||
@ -203,6 +206,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
|
||||
|
||||
|
||||
%changelog
|
||||
* Sun Feb 06 2011 Bastien Nocera <bnocera@redhat.com> 2.91.6-2
|
||||
- Fix GTK+ name in pkg-config file
|
||||
|
||||
* Wed Feb 2 2011 Christopher Aillon <caillon@redhat.com> - 2.91.6-1
|
||||
- Update to 2.91.6
|
||||
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
diff -up brasero-2.29.91/nautilus/nautilus-burn-extension.c.fix-cd-burner brasero-2.29.91/nautilus/nautilus-burn-extension.c
|
||||
--- brasero-2.29.91/nautilus/nautilus-burn-extension.c.fix-cd-burner 2010-02-22 15:37:17.000000000 -0500
|
||||
+++ brasero-2.29.91/nautilus/nautilus-burn-extension.c 2010-03-03 20:38:00.784400518 -0500
|
||||
@@ -265,6 +265,8 @@ write_activate (GtkWindow *toplevel)
|
||||
if (nautilus_disc_burn_is_empty (toplevel))
|
||||
return;
|
||||
|
||||
+ ensure_initialized ();
|
||||
+
|
||||
track = brasero_track_data_cfg_new ();
|
||||
brasero_track_data_cfg_add (track, BURN_URI, NULL);
|
||||
|
||||
@@ -433,6 +435,8 @@ check_disc_activate_cb (NautilusMenuItem
|
||||
{
|
||||
BraseroSumDialog *dialog;
|
||||
|
||||
+ ensure_initialized ();
|
||||
+
|
||||
dialog = brasero_sum_dialog_new ();
|
||||
tool_dialog_run (BRASERO_TOOL_DIALOG (dialog),
|
||||
GTK_WINDOW (user_data),
|
||||
@@ -504,7 +508,12 @@ drive_is_cd_device (GDrive *gdrive)
|
||||
|
||||
DEBUG_PRINT ("Got device: %s\n", device);
|
||||
|
||||
- monitor = brasero_medium_monitor_get_default ();
|
||||
+ /* FIXME: since we call the monitor, the library should be initialized.
|
||||
+ * To avoid all the initializing we'll be able to use the new GIO API
|
||||
+ * (#594649 - Have a way to detect optical drives) */
|
||||
+ ensure_initialized();
|
||||
+
|
||||
+ monitor = brasero_medium_monitor_get_default ();
|
||||
drive = brasero_medium_monitor_get_drive (monitor, device);
|
||||
g_object_unref (monitor);
|
||||
g_free (device);
|
||||
@@ -620,8 +629,6 @@ nautilus_disc_burn_get_file_items (Nauti
|
||||
BraseroMedia media;
|
||||
BraseroTrackType *type;
|
||||
|
||||
- ensure_initialized();
|
||||
-
|
||||
device_path = g_volume_get_identifier (volume, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE);
|
||||
monitor = brasero_medium_monitor_get_default ();
|
||||
bdrive = brasero_medium_monitor_get_drive (monitor, device_path);
|
||||
255
gtk-build.patch
255
gtk-build.patch
@ -1,255 +0,0 @@
|
||||
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-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);
|
||||
|
||||
- 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-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)
|
||||
{
|
||||
- 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-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);
|
||||
|
||||
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-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-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),
|
||||
GTK_DIALOG_MODAL|
|
||||
- GTK_DIALOG_NO_SEPARATOR|
|
||||
GTK_DIALOG_DESTROY_WITH_PARENT,
|
||||
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-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);
|
||||
|
||||
- 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 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;
|
||||
|
||||
- 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 (Gtk
|
||||
"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 (Gtk
|
||||
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 (Gtk
|
||||
/* 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 -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 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),
|
||||
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 -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-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 12:37:52.699997999 -0400
|
||||
@@ -156,7 +156,6 @@ brasero_eject_dialog_init (BraseroEjectD
|
||||
|
||||
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 -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 12:37:52.885998000 -0400
|
||||
@@ -201,7 +201,6 @@ brasero_multi_song_props_init (BraseroMu
|
||||
|
||||
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 -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 12:37:53.082997999 -0400
|
||||
@@ -296,7 +296,6 @@ brasero_plugin_option_init (BraseroPlugi
|
||||
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 -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 12:37:53.288997999 -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);
|
||||
- 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 -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 12:37:53.539997999 -0400
|
||||
@@ -153,7 +153,6 @@ brasero_song_props_init (BraseroSongProp
|
||||
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 -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 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);
|
||||
|
||||
- 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 -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;
|
||||
Loading…
Reference in New Issue
Block a user