rpms
/
compiz
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix crash with gwd using close button, rhbz (#1300162, #1298016)

This commit is contained in:
Wolfgang Ulbrich 2016-01-22 05:44:13 +01:00
parent 4bb8d54f8d
commit 1110b93fa5
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
compiz.spec
View File

@ -10,7 +10,7 @@ URL: https://github.com/raveit65/compiz
License: GPLv2+ and LGPLv2+ and MIT
Group: User Interface/Desktops
Version: 0.8.10
Release: 2%{?dist}
Release: 3%{?dist}
Epoch: 1
Summary: OpenGL window and compositing manager
@ -21,6 +21,9 @@ Source0: https://github.com/raveit65/%{name}/releases/download/v%{version}
# fedora specific
Patch0: compiz_fedora-logo.patch
# rhbz (#1300162, #1298016)
# https://github.com/raveit65/compiz/commit/b76e810
Patch1: compiz_gtk-window-decorator-do-not-free-what-should-not-be-freed.patch
BuildRequires: libX11-devel
BuildRequires: libdrm-devel
@ -92,6 +95,7 @@ windows and compositing manager.
%setup -q
%patch0 -p1 -b .fedora-logo
%patch1 -p1 -b .gtk-window-decorator
%build
%configure \
@ -172,6 +176,9 @@ fi
%changelog
* Fri Jan 22 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1:0.8.10-3
- fix crash with gwd using close button, rhbz (#1300162, #1298016)
* Sun Dec 20 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1:0.8.10-2
- fix runtime requires

27
compiz_gtk-window-decorator-do-not-free-what-should-not-be-freed.patch Normal file
View File

@ -0,0 +1,27 @@
diff --git a/gtk/window-decorator/gtk-window-decorator.c b/gtk/window-decorator/gtk-window-decorator.c
index 97b32b2..59ae4fe 100644
--- a/gtk/window-decorator/gtk-window-decorator.c
+++ b/gtk/window-decorator/gtk-window-decorator.c
@@ -5146,9 +5146,10 @@ static void
show_force_quit_dialog (WnckWindow *win,
Time timestamp)
{
- decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
- GtkWidget *dialog;
- gchar *str, *tmp, *message;
+ decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
+ GtkWidget *dialog;
+ gchar *str, *tmp;
+ const gchar *message;
if (d->force_quit_dialog)
return;
@@ -5166,7 +5167,6 @@ show_force_quit_dialog (WnckWindow *win,
str,
message);
g_free (str);
- g_free (message);
gtk_window_set_icon_name (GTK_WINDOW (dialog), "force-quit");