rpms/libquicktime/devel libquicktime-1.1.5-gtk.patch, NONE, 1.1 libquicktime.spec, 1.17, 1.18

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/free/rpms/libquicktime/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27099

Modified Files:
	libquicktime.spec 
Added Files:
	libquicktime-1.1.5-gtk.patch 
Log Message:
Add patch from Dan Horák for newer gtk


libquicktime-1.1.5-gtk.patch:
 libquicktime_config.c |    4 ++--
 lqt_gtk.c             |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE libquicktime-1.1.5-gtk.patch ---
diff -up libquicktime-1.1.5/utils/gtk/libquicktime_config.c.gtk libquicktime-1.1.5/utils/gtk/libquicktime_config.c
--- libquicktime-1.1.5/utils/gtk/libquicktime_config.c.gtk	2010-07-08 12:21:24.000000000 +0200
+++ libquicktime-1.1.5/utils/gtk/libquicktime_config.c	2010-07-08 12:22:45.000000000 +0200
@@ -112,8 +112,8 @@ static MainWindow * create_main_window()
                    G_CALLBACK(main_window_button_callback),
                    (gpointer)ret);
 
-  GTK_WIDGET_SET_FLAGS (ret->close_button, GTK_CAN_DEFAULT);
-  GTK_WIDGET_SET_FLAGS (ret->save_button, GTK_CAN_DEFAULT);
+  gtk_widget_set_can_default(GTK_WIDGET(ret->close_button), TRUE);
+  gtk_widget_set_can_default(GTK_WIDGET(ret->save_button), TRUE);
   
   gtk_widget_show(ret->close_button);
   gtk_widget_show(ret->save_button);
diff -up libquicktime-1.1.5/utils/gtk/lqt_gtk.c.gtk libquicktime-1.1.5/utils/gtk/lqt_gtk.c
--- libquicktime-1.1.5/utils/gtk/lqt_gtk.c.gtk	2010-07-08 12:27:26.000000000 +0200
+++ libquicktime-1.1.5/utils/gtk/lqt_gtk.c	2010-07-08 12:27:04.000000000 +0200
@@ -941,9 +941,9 @@ lqtgtk_create_codec_config_window(lqt_co
 		   G_CALLBACK(codec_config_window_button_callback),
 		   (gpointer)ret);
 
-  GTK_WIDGET_SET_FLAGS (ret->apply_button, GTK_CAN_DEFAULT);
-  GTK_WIDGET_SET_FLAGS (ret->close_button, GTK_CAN_DEFAULT);
-  GTK_WIDGET_SET_FLAGS (ret->restore_button, GTK_CAN_DEFAULT);
+  gtk_widget_set_can_default(GTK_WIDGET(ret->apply_button), TRUE);
+  gtk_widget_set_can_default(GTK_WIDGET(ret->close_button), TRUE);
+  gtk_widget_set_can_default(GTK_WIDGET(ret->restore_button), TRUE);
 
   gtk_widget_show(ret->apply_button);
   gtk_widget_show(ret->close_button);
@@ -1240,7 +1240,7 @@ lqtgtk_create_codec_info_window(const lq
   ret->mainbox = gtk_vbox_new(0, 10);
 
   ret->close_button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
-  GTK_WIDGET_SET_FLAGS (ret->close_button, GTK_CAN_DEFAULT);
+  gtk_widget_set_can_default(GTK_WIDGET(ret->close_button), TRUE);
 
   g_signal_connect(G_OBJECT(ret->close_button), "clicked",
                      G_CALLBACK(codec_info_window_button_callback),


Index: libquicktime.spec
===================================================================
RCS file: /cvs/free/rpms/libquicktime/devel/libquicktime.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libquicktime.spec	1 May 2010 17:28:37 -0000	1.17
+++ libquicktime.spec	10 Jul 2010 15:18:48 -0000	1.18
@@ -1,11 +1,12 @@
 Summary: 	Library for reading and writing Quicktime files
 Name: 		libquicktime
 Version:	1.1.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	LGPLv2+
 Group: 		System Environment/Libraries
 URL: 		http://libquicktime.sourceforge.net/
 Source0: 	http://downloads.sourceforge.net/libquicktime/%{name}-%{version}.tar.gz
+Patch0:         libquicktime-1.1.5-gtk.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libdv-devel
@@ -56,6 +57,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .gtk
 
 
 # --------------------------------------------------------------------
@@ -130,6 +132,9 @@
 # --------------------------------------------------------------------
 
 %changelog
+* Sat Jul 10 2010 Nicolas Chauvet <kwizart at gmail.com> - 1.1.5-2
+- Add libquicktime-1.1.5-gtk.patch from Dan Horák.
+
 * Sat May 01 2010 Nicolas Chauvet <kwizart at fedoraproject.org> - 1.1.5-1
 - Update to 1.1.5