rpms/kdebase-workspace/devel kdebase-workspace-4.0.3-menu-switch.patch, 1.1, 1.2

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23669/devel

Modified Files:
	kdebase-workspace-4.0.3-menu-switch.patch 
Log Message:
Fix patch.

kdebase-workspace-4.0.3-menu-switch.patch:

Index: kdebase-workspace-4.0.3-menu-switch.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace-4.0.3-menu-switch.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-workspace-4.0.3-menu-switch.patch	31 Mar 2008 14:07:27 -0000	1.1
+++ kdebase-workspace-4.0.3-menu-switch.patch	31 Mar 2008 14:32:25 -0000	1.2
@@ -1,21 +1,30 @@
 diff -ur kdebase-workspace-4.0.3/plasma/applets/kickoff/applet/applet.cpp kdebase-workspace-4.0.3-menu-switch/plasma/applets/kickoff/applet/applet.cpp
 --- kdebase-workspace-4.0.3/plasma/applets/kickoff/applet/applet.cpp	2008-03-27 21:34:51.000000000 +0100
-+++ kdebase-workspace-4.0.3-menu-switch/plasma/applets/kickoff/applet/applet.cpp	2008-03-31 16:02:13.000000000 +0200
-@@ -79,6 +79,13 @@
++++ kdebase-workspace-4.0.3-menu-switch/plasma/applets/kickoff/applet/applet.cpp	2008-03-31 16:29:44.000000000 +0200
+@@ -55,6 +55,7 @@
+     QCheckBox *switchOnHoverCheckBox;
+     KIntNumInput *visibleCountEdit;
+     QAction* switcher;
++    QList<QAction*> actions;
+ 
+     Private() : launcher(0), dialog(0), switcher(0) {}
+     ~Private() { delete dialog; delete launcher; }
+@@ -79,6 +80,14 @@
      delete d;
  }
  
 +void LauncherApplet::init()
 +{
-+    QAction* switcher = new QAction(i18n("Switch to Classic Menu Style"), this);
-+    d->actions.append(switcher);
-+    connect(switcher, SIGNAL(triggered(bool)), this, SLOT(switchMenuStyle()));
++    Q_ASSERT( ! d->switcher );
++    d->switcher = new QAction(i18n("Switch to Classic Menu Style"), this);
++    d->actions.append(d->switcher);
++    connect(d->switcher, SIGNAL(triggered(bool)), this, SLOT(switchMenuStyle()));
 +}
 +
  Qt::Orientations LauncherApplet::expandingDirections() const
  {
      return 0;
-@@ -212,4 +219,9 @@
+@@ -212,4 +221,9 @@
      d->icon->setPressed();
  }
  
@@ -45,19 +54,28 @@
          void switchMenuStyle();
 diff -ur kdebase-workspace-4.0.3/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp kdebase-workspace-4.0.3-menu-switch/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp
 --- kdebase-workspace-4.0.3/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp	2008-03-27 21:34:51.000000000 +0100
-+++ kdebase-workspace-4.0.3-menu-switch/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp	2008-03-31 15:54:34.000000000 +0200
-@@ -148,6 +148,10 @@
++++ kdebase-workspace-4.0.3-menu-switch/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp	2008-03-31 16:30:51.000000000 +0200
+@@ -63,6 +63,7 @@
+         KDialog *dialog;
+         QComboBox *viewComboBox;
+ 
++        QList<QAction*> actions;
+         QAction* switcher;
+         Private() : menuview(0), launcher(0), dialog(0), switcher(0) {}
+         ~Private() { delete dialog; delete menuview; }
+@@ -148,6 +149,11 @@
  
      Kickoff::UrlItemLauncher::addGlobalHandler(Kickoff::UrlItemLauncher::ExtensionHandler,"desktop",new Kickoff::ServiceItemHandler);
      Kickoff::UrlItemLauncher::addGlobalHandler(Kickoff::UrlItemLauncher::ProtocolHandler, "leave", new Kickoff::LeaveItemHandler);
 +
-+    QAction* switcher = new QAction(i18n("Switch to Kickoff Menu Style"), this);
-+    d->actions.append(switcher);
-+    connect(switcher, SIGNAL(triggered(bool)), this, SLOT(switchMenuStyle()));
++    Q_ASSERT( ! d->switcher );
++    d->switcher = new QAction(i18n("Switch to Kickoff Menu Style"), this);
++    d->actions.append(d->switcher);
++    connect(d->switcher, SIGNAL(triggered(bool)), this, SLOT(switchMenuStyle()));
  }
      
  QSizeF MenuLauncherApplet::sizeHint() const
-@@ -331,4 +335,9 @@
+@@ -331,4 +337,9 @@
      }
  }