Update patch to fix another segmentation fault.

Package-Manager: portage-2.1.3.15

3 files changed, 51 insertions, 12 deletions

diff --git a/x11-misc/superswitcher/ChangeLog b/x11-misc/superswitcher/ChangeLog
index ef2988c013d7..0e214b3bd55f 100644
--- a/x11-misc/superswitcher/ChangeLog
+++ b/x11-misc/superswitcher/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/superswitcher
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/superswitcher/ChangeLog,v 1.4 2007/10/22 16:56:11 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/superswitcher/ChangeLog,v 1.5 2007/10/23 16:54:22 swegener Exp $
+
+  23 Oct 2007; Sven Wegener <swegener@gentoo.org>
+  files/superswitcher-0.6-wnck-workspace.patch:
+  Update patch to fix another segmentation fault.
 
   22 Oct 2007; Sven Wegener <swegener@gentoo.org>
   +files/superswitcher-0.6-wnck-workspace.patch, superswitcher-0.6.ebuild:
diff --git a/x11-misc/superswitcher/Manifest b/x11-misc/superswitcher/Manifest
index eb7c96878db3..1863e6c6bb85 100644
--- a/x11-misc/superswitcher/Manifest
+++ b/x11-misc/superswitcher/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX superswitcher-0.6-wnck-workspace.patch 735 RMD160 4795dc9d5eec1d04592af43a8aa695aeb534e161 SHA1 58cbefb6b6daf26a6ee92b8ec38079f16c8ca3d5 SHA256 22172feee65c23f9bc87beac3562131bf92ddd04244f1289aaedd31a7591ea1a
-MD5 375d326323c201ce4287f058e646237c files/superswitcher-0.6-wnck-workspace.patch 735
-RMD160 4795dc9d5eec1d04592af43a8aa695aeb534e161 files/superswitcher-0.6-wnck-workspace.patch 735
-SHA256 22172feee65c23f9bc87beac3562131bf92ddd04244f1289aaedd31a7591ea1a files/superswitcher-0.6-wnck-workspace.patch 735
+AUX superswitcher-0.6-wnck-workspace.patch 1934 RMD160 8a12bdfd135ecb92c08785d867f87b9747468be6 SHA1 72fb4901ce31dae1ba1822633de444bb2caed22b SHA256 1ce3037c4edae26408e51cd4ffe7add99a4f75879f600edfdd4b993a333cc932
+MD5 3fe01febba60373f225cbf1eef400866 files/superswitcher-0.6-wnck-workspace.patch 1934
+RMD160 8a12bdfd135ecb92c08785d867f87b9747468be6 files/superswitcher-0.6-wnck-workspace.patch 1934
+SHA256 1ce3037c4edae26408e51cd4ffe7add99a4f75879f600edfdd4b993a333cc932 files/superswitcher-0.6-wnck-workspace.patch 1934
 DIST superswitcher-0.6.tar.gz 183184 RMD160 073b6b165ac4a12c016ff2db76877c9e8f2c0919 SHA1 2cea24425acee2a07dbddfa33860d20d16d4d13c SHA256 232b98d1a9443fcf4f969cf4cf00df3908c3ccb55f36059391da68873d514599
 EBUILD superswitcher-0.6.ebuild 801 RMD160 d9efab1579691c30bb1b145bc45b9861e0786091 SHA1 055fb03231b3c108970fbf42769c53314f49055d SHA256 13ad01638d97d433fb8e6fb599c7d1045453f84b4141558cefda8a31ba6ca378
 MD5 36c6e06c1daf94b23493e1b8ecdd4d2e superswitcher-0.6.ebuild 801
 RMD160 d9efab1579691c30bb1b145bc45b9861e0786091 superswitcher-0.6.ebuild 801
 SHA256 13ad01638d97d433fb8e6fb599c7d1045453f84b4141558cefda8a31ba6ca378 superswitcher-0.6.ebuild 801
-MISC ChangeLog 975 RMD160 304f4656fc30e64b72a944921c2e393680dbe4d8 SHA1 7fa3167616f7f611061ad07c8f6e4f13c9450a42 SHA256 53232e19538265ed5d8526f7c372f9308ce669e8035859012c35815175aefd52
-MD5 d03095d2c8eb4ec3ebd73b60222704b2 ChangeLog 975
-RMD160 304f4656fc30e64b72a944921c2e393680dbe4d8 ChangeLog 975
-SHA256 53232e19538265ed5d8526f7c372f9308ce669e8035859012c35815175aefd52 ChangeLog 975
+MISC ChangeLog 1124 RMD160 31665f30c26e68d3dfce8cc6dba9c701bed83f4d SHA1 7f7b3afb3e0946f0b41e2f236393c71c801f9de0 SHA256 a46625eddc35dd61b5e9af47e493e5126be4f0d3079209a70065b4d6c4382b14
+MD5 ac05c37198fb4178a22bb8b889f998e6 ChangeLog 1124
+RMD160 31665f30c26e68d3dfce8cc6dba9c701bed83f4d ChangeLog 1124
+SHA256 a46625eddc35dd61b5e9af47e493e5126be4f0d3079209a70065b4d6c4382b14 ChangeLog 1124
 MISC metadata.xml 497 RMD160 e16d1cec2a516847390f8bac0f776ec75176b5be SHA1 934d789f9dc546eb32f8b5d775b48ae588aaa032 SHA256 177d65f1082f9f1cf5c1ab3e8916b829933b4b9b326ebc98d01e765a87efb86a
 MD5 e5661fe73fe276b39827a6991d4d3ed7 metadata.xml 497
 RMD160 e16d1cec2a516847390f8bac0f776ec75176b5be metadata.xml 497
@@ -24,7 +24,7 @@ SHA256 310daed77a552a0a2d09185cd53e1ceb8efb3a2f955248742a03f472e2194a38 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHHNYwI1lqEGTUzyQRAiYlAJ409xpIkHVZdVNnyns0aF66ja/1CwCeI1Ec
-Q18mTLAgTh1upFJ08X+i1Pk=
-=aagv
+iD8DBQFHHidFI1lqEGTUzyQRAoWLAJ9fBAOFKVEqx2UuICiBhk2ZliWSCgCfVxki
+vNFxNoJQ/n4zQ061ZgFHQKU=
+=dfYr
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/superswitcher/files/superswitcher-0.6-wnck-workspace.patch b/x11-misc/superswitcher/files/superswitcher-0.6-wnck-workspace.patch
index 94ac8c20991c..90919a57485b 100644
--- a/x11-misc/superswitcher/files/superswitcher-0.6-wnck-workspace.patch
+++ b/x11-misc/superswitcher/files/superswitcher-0.6-wnck-workspace.patch
@@ -25,3 +25,38 @@ It seems like wnck_window_is_skip_pager isn't all we need to check.
    workspace = ss_screen_get_nth_workspace (screen, n);
  
    window = ss_window_new (workspace, wnck_window);
+--- superswitcher/src/window.c
++++ superswitcher/src/window.c
+@@ -254,6 +254,7 @@
+ static void
+ on_workspace_changed (WnckWindow *wnck_window, gpointer data)
+ {
++  WnckWorkspace *wnck_workspace;
+   SSWindow *window;
+   SSWorkspace *old_workspace;
+   SSWorkspace *new_workspace;
+@@ -261,12 +262,19 @@
+ 
+   window = (SSWindow *) data;
+   old_workspace = window->workspace;
+-  new_workspace_id = wnck_workspace_get_number (wnck_window_get_workspace (wnck_window));
+-  new_workspace = ss_screen_get_nth_workspace (old_workspace->screen, new_workspace_id);
+-
+   ss_workspace_remove_window (old_workspace, window);
++
++  wnck_workspace = wnck_window_get_workspace (wnck_window);
++  if (wnck_workspace) {
++    new_workspace_id = wnck_workspace_get_number (wnck_workspace);
++    new_workspace = ss_screen_get_nth_workspace (old_workspace->screen, new_workspace_id);
++
++    ss_workspace_add_window (new_workspace, window);
++    window->workspace = new_workspace;
++  } else {
++    window->workspace = NULL;
++  }
++
+-  window->workspace = new_workspace;
+-  ss_workspace_add_window (new_workspace, window);
+   window->new_window_index = -1;
+   gtk_widget_queue_draw (gtk_widget_get_toplevel (window->widget));
+ }