kerry/svn.patch

   1 Index: src/beaglesearch.cpp
   2 ===================================================================
   3 --- src/beaglesearch.cpp        (revision 625817)
   4 +++ src/beaglesearch.cpp        (revision 631841)
   5 @@ -65,6 +65,7 @@
   6         { BeagleSearch::Contact, "fixme:ImGroupWise", I18N_NOOP("GroupWise: %1")"<br>" },
   7  //       { BeagleSearch::Conversations, "fixme:speakingto", I18N_NOOP("From: %1")"<br>" },
   8         { BeagleSearch::Conversations, "fixme:speakingto", 0 },
   9 +       { BeagleSearch::Conversations, "fixme:speakingto_alias", 0 },
  10         { BeagleSearch::Conversations, "fixme:protocol", I18N_NOOP("Protocol: %1")"<br>" },
  11         { BeagleSearch::Conversations, "fixme:starttime", I18N_NOOP("Start time: %1")"<br>" },
  12         { BeagleSearch::Conversations, "fixme:endtime", I18N_NOOP("End time: %1")"<br>" },
  13 Index: src/kcm/indexing.cpp
  14 ===================================================================
  15 --- src/kcm/indexing.cpp        (revision 625817)
  16 +++ src/kcm/indexing.cpp        (revision 631841)
  17 @@ -260,8 +260,12 @@
  18      if (dlg.exec())
  19      {
  20         if ( w.radioButtonFolder->isChecked()) {
  21 -         if (!w.folderRequester->lineEdit()->text().isEmpty())
  22 -           new KListViewItem(privacy_list,"Path",w.folderRequester->lineEdit()->text());
  23 +         QString path = w.folderRequester->lineEdit()->text();
  24 +         if (!path.isEmpty()) {
  25 +           if (path.startsWith("~"))
  26 +             path.replace('~', QDir::homeDirPath());
  27 +           new KListViewItem(privacy_list,"Path",path);
  28 +         }
  29         }
  30         else
  31           if (!w.patternEdit->text().isEmpty())
  32 Index: src/searchdlg.cpp
  33 ===================================================================
  34 --- src/searchdlg.cpp   (revision 625817)
  35 +++ src/searchdlg.cpp   (revision 631841)
  36 @@ -883,9 +883,11 @@
  37          item->insertHeaderWidget(1,headerFileLabel);
  38          connect(headerFileLabel, SIGNAL(leftClickedURL()), SLOT(slotOpen()));
  39        }
  40 -      else if (*(result->mime_type)=="beagle/x-kopete-log" || *(result->mime_type)=="beagle/x-gaim-log") {
  41 +      else if (*(result->mime_type)=="beagle/x-kopete-log" || *(result->mime_type)=="beagle/x-gaim-log" || (*(result->uri)).startsWith("konversation:/")) {
  42          if (*(result->mime_type)=="beagle/x-kopete-log")
  43            item->setIcon("kopete");
  44 +        else if ((*(result->uri)).startsWith("konversation://"))
  45 +          item->setIcon("konversation");
  46          else
  47            item->setIcon("gaim");
  48
  49 @@ -900,6 +902,9 @@
  50          headerFileLabel->setURL(*(result->uri));
  51          QStringList _properties(result->properties);
  52          QString person = takeProperty("fixme:speakingto",_properties);
  53 +        QString person_alias = takeProperty("fixme:speakingto_alias",_properties);
  54 +        if (!person_alias.isEmpty())
  55 +           person = person_alias;
  56          headerFileLabel->setText(i18n("Conversation With %1").arg(person.isEmpty() ? i18n("Unknown Person") : person));
  57          item->insertHeaderWidget(0,headerFileLabel);
  58          connect(headerFileLabel, SIGNAL(leftClickedURL()), SLOT(slotOpen()));
  59 @@ -1320,19 +1325,23 @@
  60      HitWidget* item = static_cast<HitWidget*>(sender()->parent());
  61      if (item) {
  62        QString mimetype = item->mimetype();
  63 -      if (mimetype=="beagle/x-kopete-log" || mimetype=="beagle/x-gaim-log") {
  64 +      if (mimetype=="beagle/x-kopete-log" || mimetype=="beagle/x-gaim-log" || item->uri().startsWith("konversation:/")) {
  65          KProcess *proc = new KProcess;
  66          *proc << "beagle-imlogviewer";
  67          KURL kuri = KURL(item->uri());
  68          QString uri = kuri.path();
  69          if (mimetype=="beagle/x-kopete-log")
  70            *proc << "--client" << "kopete" << "--highlight-search" << current_query.get() << uri;
  71 +        else if (item->uri().startsWith("konversation:/"))
  72 +          *proc << "--client" << "konversation" << "--highlight-search" << current_query.get() << kuri.prettyURL().mid(kuri.prettyURL().find("@dumb")+5);
  73          else
  74            *proc << "--client" << "gaim" << "--highlight-search" << current_query.get() << uri;
  75          if (!proc->start()) {
  76  //        KMessageBox::error(0,i18n("Could not start instant message log viewer."));
  77            if (mimetype=="beagle/x-kopete-log")
  78              KRun::runURL(uri, "text/plain", false, true);
  79 +          else if (item->uri().startsWith("konversation:/"))
  80 +            KRun::runURL("file://"+kuri.prettyURL().mid(kuri.prettyURL().find("@dumb")+5).replace('#',"%23"), "text/plain", false, true);
  81            else
  82              KRun::runURL(uri, "text/html", false, true);
  83            return;
  84 Index: src/kerryapp.cpp
  85 ===================================================================
  86 --- src/kerryapp.cpp    (revision 625817)
  87 +++ src/kerryapp.cpp    (revision 631841)
  88 @@ -254,7 +254,11 @@
  89      }
  90
  91      if (current_wapidir)
  92 +#if KDE_IS_VERSION(3,5,0)
  93          KPassivePopup::message(KPassivePopup::Boxed, i18n("System May Be Slower Than Usual"), i18n("The daily process that updates the search index for system documentation\n is running, which may make the system appear slower than usual.\n\nThis process should complete shortly."), BarIcon("info"), sysTrayIcon, 0, 10000);
  94 +#else
  95 +        KPassivePopup::message(i18n("System May Be Slower Than Usual"), i18n("The daily process that updates the search index for system documentation\n is running, which may make the system appear slower than usual.\n\nThis process should complete shortly."), BarIcon("info"), sysTrayIcon, 0, 10000);
  96 +#endif
  97  }
  98
  99  #include "kerryapp.moc"