rpms/kdebase/F-10 kdebase-4.1.2-konsole-session-1.patch, 1.2, 1.3 kdebase.spec, 1.344, 1.345

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7333/F-10

Modified Files:
	kdebase-4.1.2-konsole-session-1.patch kdebase.spec 
Log Message:
* Mon Oct 06 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.2-4
- updated konsole session management patch from Stefan Becker

kdebase-4.1.2-konsole-session-1.patch:

Index: kdebase-4.1.2-konsole-session-1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-10/kdebase-4.1.2-konsole-session-1.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdebase-4.1.2-konsole-session-1.patch	6 Oct 2008 14:19:24 -0000	1.2
+++ kdebase-4.1.2-konsole-session-1.patch	6 Oct 2008 18:56:28 -0000	1.3
@@ -1,5 +1,14 @@
 --- kdebase-4.1.1/apps/konsole/src/ViewManager.cpp
 +++ kdebase-4.1.1/apps/konsole/src/ViewManager.cpp
+@@ -885,7 +885,7 @@ void ViewManager::saveSessions(KConfigGroup& group)
+         Q_ASSERT(view);
+         Session *session = _sessionMap[view];
+         ids << SessionManager::instance()->getRestoreId(session);
+-        if (view == activeview) group.writeEntry("Active", tab);
++        if (view == activeview) group.writeEntry("ActiveTabIndex", tab);
+         unique.insert(session, 1);
+         tab++;
+     }
 @@ -905,24 +905,37 @@ void ViewManager::saveSessions(KConfigGroup& group)
  void ViewManager::restoreSessions(const KConfigGroup& group)
  {
@@ -14,7 +23,7 @@
 -        Session *session = SessionManager::instance()->idToSession(id);
 +        // Incomplete session file, e.g. from a KDE3 session. Create a
 +        // default session so that we don't end up with an empty window.
-+        kError() << "Restoring window from invalid session data!" << endl;
++        kWarning() << i18n("Unable to restore saved tabs. Possibly unsupported KDE 3 session data.");
 +        Session *session = SessionManager::instance()->createSession();
          createView(session);
 -        if (!session->isRunning())
@@ -29,9 +38,9 @@
      {
 -        _viewSplitter->activeContainer()->setActiveView(display);
 -        display->setFocus(Qt::OtherFocusReason);
-+        int activeTab = group.readEntry("Active", 0);
++        int activeTab = group.readEntry("ActiveTabIndex", 0);
 +        int tab = 1;
-+        TerminalDisplay *display = 0;
++        QWidget *focusView = 0;
 +
 +        foreach(int id, ids)
 +        {
@@ -40,13 +49,13 @@
 +            if (!session->isRunning())
 +                session->run();
 +            if (tab++ == activeTab)
-+                display = dynamic_cast<TerminalDisplay*>(activeView());
++                focusView = activeView();
 +        }
 +
-+        if (display)
++        if (focusView)
 +        {
-+            _viewSplitter->activeContainer()->setActiveView(display);
-+            display->setFocus(Qt::OtherFocusReason);
++            _viewSplitter->activeContainer()->setActiveView(focusView);
++            focusView->setFocus(Qt::OtherFocusReason);
 +        }
      }
  }


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-10/kdebase.spec,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -r1.344 -r1.345
--- kdebase.spec	6 Oct 2008 13:48:37 -0000	1.344
+++ kdebase.spec	6 Oct 2008 18:56:28 -0000	1.345
@@ -1,7 +1,7 @@
 
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.1.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -309,6 +309,9 @@
 
 
 %changelog
+* Mon Oct 06 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.2-4
+- updated konsole session management patch from Stefan Becker
+
 * Mon Oct 06 2008 Than Ngo <than at redhat.com> 4.1.2-3
 - bz#465451, backport konsole session management, thanks to Stefan Becker