File kcall-fixes-from-svn.diff of Package kcall

Overview Repositories Revisions Requests Users Attributes Meta

File kcall-fixes-from-svn.diff of Package kcall

--- kcall/kontactplugin/kcall_plugin.cpp
+++ kcall/kontactplugin/kcall_plugin.cpp
@@ -168,7 +168,7 @@ void KCallUniqueAppHandler::loadCommandL
 
 int KCallUniqueAppHandler::newInstance()
 {
-    kDebug(5602) << k_funcinfo << endl;
+    kDebug(5602) << endl;
     // Ensure part is loaded
     (void)plugin()->part();
 
@@ -176,7 +176,7 @@ int KCallUniqueAppHandler::newInstance()
     QDBusReply<bool> reply = kcall.handleCommandLine();
     if(reply.isValid() ) {
         bool handled = reply;
-        kDebug(5602) << k_funcinfo << "handled=" << handled << endl;
+        kDebug(5602) << "handled=" << handled << endl;
         if ( !handled ) // no args -> simply bring kcall plugin to front
             return Kontact::UniqueAppHandler::newInstance();    
     }
--- kcall/dtmfinput.ui
+++ kcall/dtmfinput.ui
@@ -9,9 +9,6 @@
     <height>161</height>
    </rect>
   </property>
-  <property name="windowTitle" >
-   <string>Form</string>
-  </property>
   <layout class="QGridLayout" >
    <item row="0" column="0" >
     <widget class="QPushButton" name="button1" >
--- kcall/CMakeLists.txt
+++ kcall/CMakeLists.txt
@@ -71,6 +71,8 @@ SET_TARGET_PROPERTIES(kcall PROPERTIES V
 )
 INSTALl(TARGETS kcall  DESTINATION ${LIB_INSTALL_DIR})
 
+ADD_SUBDIRECTORY (icons)
+
 ########### next target ###############
 
 SET(kcall_bin_SRCS
--- kcall/kcallcore.cpp
+++ kcall/kcallcore.cpp
@@ -294,7 +294,7 @@ void KCallCore::initActions()
 
   // misc
 /*    QAction *clearLocation = coll->addAction( "clear_search" );
-    clearLocation->setIcon( KIcon(QApplication::isRightToLeft() ? "clear-left" : "locationbar-erase") );
+    clearLocation->setIcon( KIcon(QApplication::isRightToLeft() ? "edit-clear-locationbar-rtl" : "edit-clear-locationbar") );
     clearLocation->setText( i18n( "Clear Search Bar" ) );
     connect(clearLocation, SIGNAL(triggered(bool) ), SLOT( slotClearSearchBar() ));
     clearLocation->setShortcut(QKeySequence(Qt::CTRL+Qt::Key_L));
--- kcall/vcardview.cpp
+++ kcall/vcardview.cpp
@@ -63,7 +63,7 @@ VCardView::VCardView(HistoryModel * cons
     ui.vcText->hide();
 
     ui.vcPicture->setFixedSize(80, 80);
-    ui.vcPicture->setPixmap( KIconLoader::global()->loadIcon( "personal", K3Icon::Desktop, 128 ) );
+    ui.vcPicture->setPixmap( KIconLoader::global()->loadIcon( "personal", KIconLoader::Desktop, 128 ) );
 }
 
 void VCardView::setAddressee(KABC::Addressee person)
@@ -97,7 +97,7 @@ void VCardView::setAddressee(KABC::Addre
 
     QPixmap photo = QPixmap(person.photo().data());
     if ( photo.size().isEmpty() == 0)
-        photo = KIconLoader::global()->loadIcon( "personal", K3Icon::Desktop, 128 );
+        photo = KIconLoader::global()->loadIcon( "personal", KIconLoader::Desktop, 128 );
     ui.vcPicture->setPixmap( photo );
     kDebug() << ui.vcPicture->size()<< endl;
 }
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -1,20 +1,18 @@
 PROJECT(kcall)
 CMAKE_MINIMUM_REQUIRED(VERSION 2.4.3)
-SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
+SET(CMAKE_MODULE_PATH ${kcall_SOURCE_DIR}/cmake/modules )
 SET(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
 
-FIND_PACKAGE(Qt4 REQUIRED)
-
 # search packages used by KDE
 find_package (KDE4 REQUIRED)
 include(KDE4Defaults)
 include(MacroLibrary)
 include(MacroOptionalAddSubdirectory)
+include(Qt4DBusMacros)
 
 FIND_PACKAGE(KdepimLibs REQUIRED)
 INCLUDE(FindPkgConfig REQUIRED)
 INCLUDE(FindDoxygen)
-INCLUDE(Qt4DBusMacros)
 
 OPTION(KCALL_ENABLE_KONTACT_PLUGIN
   "enable building of kontact plugin (unstable)"
--- applet/kcall/kcallapplet.desktop
+++ applet/kcall/kcallapplet.desktop
@@ -6,7 +6,7 @@
 Name[tr]=K Çağrı
 Name[xx]=xxKCallxx
 Exec=kcallapplet
-Icon=kcall
+Icon=internet-telephony
 Type=Application
 NoDisplay=true
 Terminal=false
--- applet/kcall/CMakeLists.txt
+++ applet/kcall/CMakeLists.txt
@@ -38,7 +38,7 @@
                       ${KDE4_KDEUI_LIBS}
 )
 
-INSTALL(TARGETS kcallapplet DESTINATION ${BIN_INSTALL_DIR})
+INSTALL(TARGETS kcallapplet ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 
 ########### install files ###############
--- kcall/kontactplugin/kcallplugin.desktop
+++ kcall/kontactplugin/kcallplugin.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Service
-Icon=kcall
+Icon=internet-telephony
 ServiceTypes=Kontact/Plugin,KPluginInfo
 
 X-KDE-Library=libkontact_kcallplugin
--- kcall/main.cpp
+++ kcall/main.cpp
@@ -129,6 +129,7 @@
     return 0;
 
   KCallApp app;
+  QApplication::setWindowIcon( KIcon( "internet-telephony" ) );
   KGlobal::locale()->insertCatalog( "libkdepim" );
 
   bool ret = app.exec();
--- kcall/CMakeLists.txt
+++ kcall/CMakeLists.txt
@@ -92,7 +92,7 @@
                       ${KDE4_KHTML_LIBS}
                       ${DECIBEL_LDFLAGS})
 
-INSTALL(TARGETS kcall_bin  DESTINATION ${BIN_INSTALL_DIR} )
+INSTALL(TARGETS kcall_bin  ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
 ########### next target ###############
 
--- kcall/kcallcore.cpp
+++ kcall/kcallcore.cpp
@@ -273,7 +273,7 @@
     */
 
 /*    mActionEditAddressee = coll->addAction( "file_properties" );
-    mActionEditAddressee->setIcon( KIcon("edit") );
+    mActionEditAddressee->setIcon( KIcon("document-properties") );
     mActionEditAddressee->setText( i18n( "&Edit Contact..." ) );
     connect(mActionEditAddressee, SIGNAL(triggered(bool) ), SLOT( editContact() ));
     mActionEditAddressee->setWhatsThis( i18n( "Edit a contact<p>You will be presented with a dialog where you can change all data about a person, including addresses and phone numbers." ) );
@@ -294,7 +294,7 @@
 
   // misc
 /*    QAction *clearLocation = coll->addAction( "clear_search" );
-    clearLocation->setIcon( KIcon(QApplication::isRightToLeft() ? "edit-clear-locationbar-rtl" : "edit-clear-locationbar") );
+    clearLocation->setIcon( KIcon(QApplication::isRightToLeft() ? "edit-clear-locationbar-rtl" : "edit-clear-locationbar-ltr") );
     clearLocation->setText( i18n( "Clear Search Bar" ) );
     connect(clearLocation, SIGNAL(triggered(bool) ), SLOT( slotClearSearchBar() ));
     clearLocation->setShortcut(QKeySequence(Qt::CTRL+Qt::Key_L));
--- kcall/kcall.desktop
+++ kcall/kcall.desktop
@@ -6,7 +6,7 @@
 Name[tr]=kçağrı
 Name[xx]=xxkcallxx
 Exec=kcall %i %m -caption "%c"
-Icon=kcall
+Icon=internet-telephony
 Categories=Network;Telephony;
 Type=Application
 DocPath=kcall/kcall.html
--- kcall/CMakeLists.txt
+++ kcall/CMakeLists.txt
@@ -104,7 +104,7 @@
 
 KDE4_ADD_PLUGIN(kcallpart WITH_PREFIX ${kcallpart_PART_SRCS})
 
-TARGET_LINK_LIBRARIES(kcallpart  ${KDE4_KDECORE_LIBS} kcall )
+TARGET_LINK_LIBRARIES(kcallpart  ${KDE4_KPARTS_LIBS} kcall )
 
 INSTALL(TARGETS kcallpart DESTINATION ${PLUGIN_INSTALL_DIR})
 
--- kcall/CMakeLists.txt
+++ kcall/CMakeLists.txt
@@ -73,8 +73,6 @@ INSTALl(TARGETS kcall  DESTINATION ${LIB_INSTALL_DIR})
 
 ADD_SUBDIRECTORY(icons)
 
-ADD_SUBDIRECTORY (icons)
-
 ########### next target ###############
 
 SET(kcall_bin_SRCS

Places

File kcall-fixes-from-svn.diff of Package kcall

Places