[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/shells/screensaver
From:       Chani Armitage <chanika () gmail ! com>
Date:       2008-10-27 6:05:10
Message-ID: 1225087510.292068.5073.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 876323 by chani:

don't need the view id stuff here any more either :)


 M  +0 -6      org.kde.plasma-overlay.App.xml  
 M  +0 -10     plasmaapp.cpp  
 M  +1 -6      plasmaapp.h  


--- trunk/KDE/kdebase/workspace/plasma/shells/screensaver/org.kde.plasma-overlay.App.xml \
#876322:876323 @@ -1,9 +1,6 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" \
"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">  <node>
   <interface name="org.kde.plasmaoverlay.App">
-    <signal name="viewCreated">
-      <arg name="id" type="u" direction="out"/>
-    </signal>
     <signal name="hidden">
     </signal>
     <method name="activate">
@@ -12,9 +9,6 @@
     </method>
     <method name="lock">
     </method>
-    <method name="viewWinId">
-      <arg type="u" direction="out"/>
-    </method>
     <method name="quit">
     </method>
   </interface>
--- trunk/KDE/kdebase/workspace/plasma/shells/screensaver/plasmaapp.cpp \
#876322:876323 @@ -281,15 +281,6 @@
     }
 }
 
-uint PlasmaApp::viewWinId()
-{
-    if (m_view) {
-        //kDebug() << m_view->winId();
-        return m_view->effectiveWinId();
-    }
-    return 0;
-}
-
 void PlasmaApp::adjustSize(int screen)
 {
     if (! m_view) {
@@ -389,7 +380,6 @@
             if (m_idleOpacity > 0) {
                 m_view->setWindowOpacity(m_idleOpacity);
                 m_view->showView();
-                emit viewCreated(m_view->effectiveWinId()); //FIXME this won't work \
for invisible-idle and is Wrong anyways  }
         } else {
             kDebug() << "bailing out";
--- trunk/KDE/kdebase/workspace/plasma/shells/screensaver/plasmaapp.h #876322:876323
@@ -58,7 +58,7 @@
     //if you change stuff, remember to regenerate with:
     //qdbuscpp2xml -S -M plasmaapp.h > org.kde.plasma-overlay.App.xml
 
-    void viewCreated(uint id); //XXX this is actually a WId but qdbuscpp2xml is dumb
+    //XXX can this be deleted? probably. if lockprocess really cares it can use the \
unmapnotify  void hidden();
 
 public Q_SLOTS:
@@ -81,11 +81,6 @@
     void lock();
 
     //not really slots, but we want them in dbus
-    /**
-     * @return the window id of our view, or 0 if there is none
-     * again, this is really a WId but dbus doesn't like those.
-     */
-    uint viewWinId();
 
     /**
      * quit the application


[prev in list] [next in list] [prev in thread] [next in thread]