This commit is contained in:
Matthias Clasen 2011-01-07 22:51:01 -05:00
parent cb00912447
commit 17a18f95f4
2 changed files with 32 additions and 1 deletions

View File

@ -0,0 +1,24 @@
diff -up libcanberra-0.26/src/canberra-gtk-module.c.quit-add libcanberra-0.26/src/canberra-gtk-module.c
--- libcanberra-0.26/src/canberra-gtk-module.c.quit-add 2011-01-07 22:48:49.388992626 -0500
+++ libcanberra-0.26/src/canberra-gtk-module.c 2011-01-07 22:49:02.339995153 -0500
@@ -932,11 +932,6 @@ static void connect_settings(void) {
connected = TRUE;
}
-static gboolean quit_handler(gpointer data) {
- dispatch_queue();
- return FALSE;
-}
-
G_MODULE_EXPORT void gtk_module_init(gint *argc, gchar ***argv[]) {
/* This is the same quark libgnomeui uses! */
@@ -963,8 +958,6 @@ G_MODULE_EXPORT void gtk_module_init(gin
install_hook(GTK_TYPE_WIDGET, "drag-drop", &signal_id_widget_drag_drop);
install_hook(GTK_TYPE_WIDGET, "drag-failed", &signal_id_widget_drag_failed);
install_hook(GTK_TYPE_EXPANDER, "activate", &signal_id_expander_activate);
-
- gtk_quit_add(1, quit_handler, NULL);
}
G_MODULE_EXPORT gchar* g_module_check_init(GModule *module);

View File

@ -1,9 +1,12 @@
Name: libcanberra Name: libcanberra
Version: 0.26 Version: 0.26
Release: 4%{?dist} Release: 5%{?dist}
Summary: Portable Sound Event Library Summary: Portable Sound Event Library
Group: System Environment/Libraries Group: System Environment/Libraries
Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
Patch0: libcanberra-quit-add.patch
License: LGPLv2+ License: LGPLv2+
Url: http://git.0pointer.de/?p=libcanberra.git;a=summary Url: http://git.0pointer.de/?p=libcanberra.git;a=summary
BuildRequires: gtk2-devel BuildRequires: gtk2-devel
@ -77,6 +80,7 @@ Development Files for libcanberra Client Development
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .quit-add
%build %build
%configure --disable-static --enable-pulse --enable-alsa --enable-null --enable-gstreamer --disable-oss --with-builtin=dso %configure --disable-static --enable-pulse --enable-alsa --enable-null --enable-gstreamer --disable-oss --with-builtin=dso
@ -137,6 +141,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
%{_datadir}/vala/vapi/libcanberra.vapi %{_datadir}/vala/vapi/libcanberra.vapi
%changelog %changelog
* Fri Jan 7 2011 Matthias Clasen <mclasen@redhat.com> 0.26-5
- Rebuild against newer gtk
* Fri Dec 3 2010 Matthias Clasen <mclasen@redhat.com> 0.26-4 * Fri Dec 3 2010 Matthias Clasen <mclasen@redhat.com> 0.26-4
- Rebuild against new gtk - Rebuild against new gtk