summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Goldberg <george.goldberg@collabora.co.uk>2009-10-06 11:45:33 (GMT)
committerGeorge Goldberg <george.goldberg@collabora.co.uk>2009-10-06 11:45:33 (GMT)
commitd74b3e5c147052369eed8349a4143676404e6e75 (patch)
tree39ae6800793b4ec338650feede53fc1463e13213
parent3f5421a53008387ccd94c9c94a5759ed954c9cab (diff)
downloadpackage-krfb-d74b3e5c147052369eed8349a4143676404e6e75.tar.gz
package-krfb-d74b3e5c147052369eed8349a4143676404e6e75.tar.xz
Backport to KDE4.3 experimental version of KNotificationItem>
-rw-r--r--CMakeLists.txt2
-rw-r--r--debian/changelog7
-rw-r--r--debian/control5
-rw-r--r--trayicon.cpp4
-rw-r--r--trayicon.h2
5 files changed, 12 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3ca5b65..c53310a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -108,6 +108,7 @@ install (FILES
# Build the plugins
include_directories (${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${LIBKNOTIFICATIONITEM-1_INCLUDE_DIR})
add_subdirectory (framebuffers)
#####################################
@@ -164,6 +165,7 @@ target_link_libraries(krfb
${QT_QTNETWORK_LIBRARY}
${KDE4_KDNSSD_LIBS}
${KDE4_KDEUI_LIBS}
+ ${LIBKNOTIFICATIONITEM-1_LIBRARIES}
)
if (TELEPATHY_QT4_FOUND)
diff --git a/debian/changelog b/debian/changelog
index 6be12fe..630ae29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-krfb (0:4.3.49.1xxxxxx-1ubuntu1~ppa1~jaunty1) jaunty; urgency=low
+krfb (4:4.3.49.1-1ubuntu1~ppa1~jaunty1) jaunty; urgency=low
- * Initial release of the telepathy-enabled svn snapshot for use with KDE 4.3.x
+ * Initial release of the telepathy-enabled git snapshot for use with KDE 4.3.x
+ * Backport to KDE 4.3 experimental version of KNotificationItem.
- -- George Goldberg <george.goldberg@collabora.co.uk> Fri, 02 Oct 2009 12:15:06 +0100
+ -- George Goldberg <george.goldberg@collabora.co.uk> Tue, 06 Oct 2009 12:41:06 +0100
diff --git a/debian/control b/debian/control
index 067fb81..b2ff326 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,8 @@ Maintainer: George Goldberg <george.goldberg@collabora.co.uk>
Uploaders: George Goldberg <george.goldberg@collabora.co.uk>
Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), pkg-kde-tools (>= 0.4.0),
libtelepathy-qt4-dev (= 0.1.9-1ubuntu1~ppa3~jaunty1 ),
- kdelibs5-dev (>=4.2.96)
+ kdelibs5-dev (>=4.2.96), libknotificationitem-dev, kdepimlibs5-dev (>=4.2.96),
+ libvncserver-dev (>=0.9.3)
Standards-Version: 3.8.2
Homepage: http://www.kde.org/
@@ -13,7 +14,7 @@ Homepage: http://www.kde.org/
Package: krfb
Section: kde
Architecture: any
-Depends: kdelibs5 (>=4.2.96)
+Depends: ${shlibs:Depends}
Description: rfb server for KDE
Krfb, the KDE Remote Frame Buffer Server.
diff --git a/trayicon.cpp b/trayicon.cpp
index 0696813..1ede8b2 100644
--- a/trayicon.cpp
+++ b/trayicon.cpp
@@ -31,13 +31,13 @@
TrayIcon::TrayIcon(KDialog *d)
- : KNotificationItem(d),
+ : Experimental::KNotificationItem(d),
quitting(false)
{
setIconByPixmap(KIcon("krfb").pixmap(22, 22, KIcon::Disabled));
setToolTipTitle(i18n("Desktop Sharing - disconnected"));
- setCategory(KNotificationItem::ApplicationStatus);
+ setCategory(Experimental::KNotificationItem::ApplicationStatus);
// manageInvitationsAction = new KAction(i18n("Manage &Invitations"), &actionCollection);
// actionCollection.addAction("manage_invitations", manageInvitationsAction);
// connect(manageInvitationsAction, SIGNAL(triggered(bool)), SLOT(showManageInvitations()));
diff --git a/trayicon.h b/trayicon.h
index 8d7e3f2..8586e81 100644
--- a/trayicon.h
+++ b/trayicon.h
@@ -30,7 +30,7 @@ class KDialog;
* @author Tim Jansen
*/
-class TrayIcon : public KNotificationItem {
+class TrayIcon : public Experimental::KNotificationItem {
Q_OBJECT
public:
TrayIcon(KDialog*);