Gentoo Archives: gentoo-commits

From: "Sven Wegener (swegener)" <swegener@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-misc/superswitcher/files: superswitcher-0.6-wnck-workspace.patch
Date: Tue, 23 Oct 2007 16:54:28
Message-Id: E1IkN1L-0005t3-IB@stork.gentoo.org
1 swegener 07/10/23 16:54:23
2
3 Modified: superswitcher-0.6-wnck-workspace.patch
4 Log:
5 Update patch to fix another segmentation fault.
6 (Portage version: 2.1.3.15)
7
8 Revision Changes Path
9 1.2 x11-misc/superswitcher/files/superswitcher-0.6-wnck-workspace.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/superswitcher/files/superswitcher-0.6-wnck-workspace.patch?rev=1.2&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/superswitcher/files/superswitcher-0.6-wnck-workspace.patch?rev=1.2&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/superswitcher/files/superswitcher-0.6-wnck-workspace.patch?r1=1.1&r2=1.2
14
15 Index: superswitcher-0.6-wnck-workspace.patch
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/x11-misc/superswitcher/files/superswitcher-0.6-wnck-workspace.patch,v
18 retrieving revision 1.1
19 retrieving revision 1.2
20 diff -u -r1.1 -r1.2
21 --- superswitcher-0.6-wnck-workspace.patch 22 Oct 2007 16:56:11 -0000 1.1
22 +++ superswitcher-0.6-wnck-workspace.patch 23 Oct 2007 16:54:23 -0000 1.2
23 @@ -25,3 +25,38 @@
24 workspace = ss_screen_get_nth_workspace (screen, n);
25
26 window = ss_window_new (workspace, wnck_window);
27 +--- superswitcher/src/window.c
28 ++++ superswitcher/src/window.c
29 +@@ -254,6 +254,7 @@
30 + static void
31 + on_workspace_changed (WnckWindow *wnck_window, gpointer data)
32 + {
33 ++ WnckWorkspace *wnck_workspace;
34 + SSWindow *window;
35 + SSWorkspace *old_workspace;
36 + SSWorkspace *new_workspace;
37 +@@ -261,12 +262,19 @@
38 +
39 + window = (SSWindow *) data;
40 + old_workspace = window->workspace;
41 +- new_workspace_id = wnck_workspace_get_number (wnck_window_get_workspace (wnck_window));
42 +- new_workspace = ss_screen_get_nth_workspace (old_workspace->screen, new_workspace_id);
43 +-
44 + ss_workspace_remove_window (old_workspace, window);
45 ++
46 ++ wnck_workspace = wnck_window_get_workspace (wnck_window);
47 ++ if (wnck_workspace) {
48 ++ new_workspace_id = wnck_workspace_get_number (wnck_workspace);
49 ++ new_workspace = ss_screen_get_nth_workspace (old_workspace->screen, new_workspace_id);
50 ++
51 ++ ss_workspace_add_window (new_workspace, window);
52 ++ window->workspace = new_workspace;
53 ++ } else {
54 ++ window->workspace = NULL;
55 ++ }
56 ++
57 +- window->workspace = new_workspace;
58 +- ss_workspace_add_window (new_workspace, window);
59 + window->new_window_index = -1;
60 + gtk_widget_queue_draw (gtk_widget_get_toplevel (window->widget));
61 + }
62
63
64
65 --
66 gentoo-commits@g.o mailing list