Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
DISCONTINUED:openSUSE:11.1:Update
kerry
svn.diff
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File svn.diff of Package kerry
Index: src/beaglesearch.cpp =================================================================== --- src/beaglesearch.cpp (revision 625817) +++ src/beaglesearch.cpp (revision 631841) @@ -65,6 +65,7 @@ { BeagleSearch::Contact, "fixme:ImGroupWise", I18N_NOOP("GroupWise: %1")"<br>" }, // { BeagleSearch::Conversations, "fixme:speakingto", I18N_NOOP("From: %1")"<br>" }, { BeagleSearch::Conversations, "fixme:speakingto", 0 }, + { BeagleSearch::Conversations, "fixme:speakingto_alias", 0 }, { BeagleSearch::Conversations, "fixme:protocol", I18N_NOOP("Protocol: %1")"<br>" }, { BeagleSearch::Conversations, "fixme:starttime", I18N_NOOP("Start time: %1")"<br>" }, { BeagleSearch::Conversations, "fixme:endtime", I18N_NOOP("End time: %1")"<br>" }, Index: src/kcm/indexing.cpp =================================================================== --- src/kcm/indexing.cpp (revision 625817) +++ src/kcm/indexing.cpp (revision 631841) @@ -260,8 +260,12 @@ if (dlg.exec()) { if ( w.radioButtonFolder->isChecked()) { - if (!w.folderRequester->lineEdit()->text().isEmpty()) - new KListViewItem(privacy_list,"Path",w.folderRequester->lineEdit()->text()); + QString path = w.folderRequester->lineEdit()->text(); + if (!path.isEmpty()) { + if (path.startsWith("~")) + path.replace('~', QDir::homeDirPath()); + new KListViewItem(privacy_list,"Path",path); + } } else if (!w.patternEdit->text().isEmpty()) Index: src/searchdlg.cpp =================================================================== --- src/searchdlg.cpp (revision 625817) +++ src/searchdlg.cpp (revision 631841) @@ -883,9 +883,11 @@ item->insertHeaderWidget(1,headerFileLabel); connect(headerFileLabel, SIGNAL(leftClickedURL()), SLOT(slotOpen())); } - else if (*(result->mime_type)=="beagle/x-kopete-log" || *(result->mime_type)=="beagle/x-gaim-log") { + else if (*(result->mime_type)=="beagle/x-kopete-log" || *(result->mime_type)=="beagle/x-gaim-log" || (*(result->uri)).startsWith("konversation:/")) { if (*(result->mime_type)=="beagle/x-kopete-log") item->setIcon("kopete"); + else if ((*(result->uri)).startsWith("konversation://")) + item->setIcon("konversation"); else item->setIcon("gaim"); @@ -900,6 +902,9 @@ headerFileLabel->setURL(*(result->uri)); QStringList _properties(result->properties); QString person = takeProperty("fixme:speakingto",_properties); + QString person_alias = takeProperty("fixme:speakingto_alias",_properties); + if (!person_alias.isEmpty()) + person = person_alias; headerFileLabel->setText(i18n("Conversation With %1").arg(person.isEmpty() ? i18n("Unknown Person") : person)); item->insertHeaderWidget(0,headerFileLabel); connect(headerFileLabel, SIGNAL(leftClickedURL()), SLOT(slotOpen())); @@ -1320,19 +1325,23 @@ HitWidget* item = static_cast<HitWidget*>(sender()->parent()); if (item) { QString mimetype = item->mimetype(); - if (mimetype=="beagle/x-kopete-log" || mimetype=="beagle/x-gaim-log") { + if (mimetype=="beagle/x-kopete-log" || mimetype=="beagle/x-gaim-log" || item->uri().startsWith("konversation:/")) { KProcess *proc = new KProcess; *proc << "beagle-imlogviewer"; KURL kuri = KURL(item->uri()); QString uri = kuri.path(); if (mimetype=="beagle/x-kopete-log") *proc << "--client" << "kopete" << "--highlight-search" << current_query.get() << uri; + else if (item->uri().startsWith("konversation:/")) + *proc << "--client" << "konversation" << "--highlight-search" << current_query.get() << kuri.prettyURL().mid(kuri.prettyURL().find("@dumb")+5); else *proc << "--client" << "gaim" << "--highlight-search" << current_query.get() << uri; if (!proc->start()) { // KMessageBox::error(0,i18n("Could not start instant message log viewer.")); if (mimetype=="beagle/x-kopete-log") KRun::runURL(uri, "text/plain", false, true); + else if (item->uri().startsWith("konversation:/")) + KRun::runURL("file://"+kuri.prettyURL().mid(kuri.prettyURL().find("@dumb")+5).replace('#',"%23"), "text/plain", false, true); else KRun::runURL(uri, "text/html", false, true); return; Index: src/kerryapp.cpp =================================================================== --- src/kerryapp.cpp (revision 625817) +++ src/kerryapp.cpp (revision 631841) @@ -254,7 +254,11 @@ } if (current_wapidir) +#if KDE_IS_VERSION(3,5,0) 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); +#else + 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); +#endif } #include "kerryapp.moc"
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor