Hello community,
here is the log from the commit of package kerry
checked in at Sat Sep 2 19:02:48 CEST 2006.
--------
--- KDE/kerry/kerry.changes 2006-07-09 12:26:46.000000000 +0200
+++ kerry/kerry.changes 2006-09-01 22:09:20.000000000 +0200
@@ -1,0 +2,10 @@
+Fri Sep 1 22:01:49 CEST 2006 - stbinner@suse.de
+
+- update from SVN:
+ * icon converted to SVG and revised by Robert Lihm
+ * default just to Alt+Space keyboard shortcut for now
+ * fix preview for URLs with escaped chars within
+ * start beagle daemon by default
+ * fixed a memory leak
+
+-------------------------------------------------------------------
Old:
----
kerry-0.1.90.tar.bz2
New:
----
kerry-0.1.901.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kerry.spec ++++++
--- /var/tmp/diff_new_pack.v9620W/_old 2006-09-02 19:02:31.000000000 +0200
+++ /var/tmp/diff_new_pack.v9620W/_new 2006-09-02 19:02:31.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kerry (Version 0.1.90)
+# spec file for package kerry (Version 0.1.901)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -16,7 +16,7 @@
Group: System/GUI/KDE
Summary: Desktop search tool
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Version: 0.1.90
+Version: 0.1.901
Release: 1
Source: %{name}-%{version}.tar.bz2
Requires: beagle >= 0.2.6
@@ -55,6 +55,7 @@
/opt/kde3/%_lib/kde3/kerry.*
/opt/kde3/%_lib/libkdeinit_kerry.*
/opt/kde3/share/icons/*/*/*/kerry.*
+/opt/kde3/share/icons/*/*/*/kerry_systemtray.*
/opt/kde3/share/applications/kde/kerry.desktop
/opt/kde3/share/autostart/beagled.desktop
/opt/kde3/share/autostart/kerry.autostart.desktop
@@ -62,6 +63,13 @@
/opt/kde3/shutdown/beagled-shutdown.sh
%changelog -n kerry
+* Fri Sep 01 2006 - stbinner@suse.de
+- update from SVN:
+ * icon converted to SVG and revised by Robert Lihm
+ * default just to Alt+Space keyboard shortcut for now
+ * fix preview for URLs with escaped chars within
+ * start beagle daemon by default
+ * fixed a memory leak
* Wed Jun 21 2006 - stbinner@suse.de
- update to version 0.2 beta
* add Beagle backends configuration
++++++ kerry-0.1.90.tar.bz2 -> kerry-0.1.901.tar.bz2 ++++++
++++ 27320 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kerry-0.1.90/AUTHORS new/kerry-0.1.901/AUTHORS
--- old/kerry-0.1.90/AUTHORS 2005-12-13 14:35:58.000000000 +0100
+++ new/kerry-0.1.901/AUTHORS 2006-07-10 15:15:52.000000000 +0200
@@ -1,4 +1,4 @@
Stephan Binner
-Original BeagleSearch class:
+Original BeagleSearch class and part of configuration:
Debajyoti Bera
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kerry-0.1.90/TODO new/kerry-0.1.901/TODO
--- old/kerry-0.1.90/TODO 2006-06-23 07:38:07.000000000 +0200
+++ new/kerry-0.1.901/TODO 2006-08-18 10:48:01.000000000 +0200
@@ -1,10 +1,22 @@
message freeze before next release
+===
+
+add "Index data while on battery power" config setting (Beagle 0.2.8)
+
+rewrite configuration as kcm modules
+
make search dialog use KHistoryCombo
-make GUI during search non-blocking
+add non-Beagle based Konqueror bookmark searching
+
+add non-Beagle based KDE addressbook searching
+
+make GUI during search non-blocking, add a spinner (?)
+
+write (simple) replacement for beagle-imlogviewer
-write replacement for beagle-imlogviewer
+===
optional grouped results view
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kerry-0.1.90/acinclude.m4 new/kerry-0.1.901/acinclude.m4
--- old/kerry-0.1.90/acinclude.m4 2006-06-23 07:38:33.000000000 +0200
+++ new/kerry-0.1.901/acinclude.m4 2006-09-01 21:59:49.000000000 +0200
@@ -2747,7 +2747,7 @@
EXRSTATUS=old
else
kde_save_LIBS="$LIBS"
- LIBS="$LIBS $all_libraries $USER_LDFLAGS $LIBZ `pkg-config --libs OpenEXR`"
+ LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ"
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
kde_save_CXXFLAGS="$CXXFLAGS"
@@ -3499,14 +3499,10 @@
AC_DEFUN([KDE_CHECK_LIB64],
[
- kdelibsuff="$kde_libs_suffix"
- if test -z "$kdelibsuff"; then
- kdelibsuff="no"
- fi
AC_ARG_ENABLE(libsuffix,
AC_HELP_STRING([--enable-libsuffix],
[/lib directory suffix (64,32,none,auto[=default])]),
- kdelibsuff=$enableval)
+ kdelibsuff=$enableval, kdelibsuff="auto")
if test "$kdelibsuff" = "auto"; then
@@ -5001,7 +4997,6 @@
])
fi
kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
- kde_libs_suffix=`$KDECONFIG --libsuffix` || kde_libs_suffix=auto
AC_MSG_CHECKING([where to install])
if test "x$prefix" = "xNONE"; then
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kerry-0.1.90/admin/acinclude.m4.in new/kerry-0.1.901/admin/acinclude.m4.in
--- old/kerry-0.1.90/admin/acinclude.m4.in 2006-04-05 23:58:30.000000000 +0200
+++ new/kerry-0.1.901/admin/acinclude.m4.in 2006-09-01 21:59:32.000000000 +0200
@@ -2747,7 +2747,7 @@
EXRSTATUS=old
else
kde_save_LIBS="$LIBS"
- LIBS="$LIBS $all_libraries $USER_LDFLAGS $LIBZ `pkg-config --libs OpenEXR`"
+ LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ"
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
kde_save_CXXFLAGS="$CXXFLAGS"
@@ -3499,14 +3499,10 @@
AC_DEFUN([KDE_CHECK_LIB64],
[
- kdelibsuff="$kde_libs_suffix"
- if test -z "$kdelibsuff"; then
- kdelibsuff="no"
- fi
AC_ARG_ENABLE(libsuffix,
AC_HELP_STRING([--enable-libsuffix],
[/lib directory suffix (64,32,none,auto[=default])]),
- kdelibsuff=$enableval)
+ kdelibsuff=$enableval, kdelibsuff="auto")
if test "$kdelibsuff" = "auto"; then
@@ -5001,7 +4997,6 @@
])
fi
kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
- kde_libs_suffix=`$KDECONFIG --libsuffix` || kde_libs_suffix=auto
AC_MSG_CHECKING([where to install])
if test "x$prefix" = "xNONE"; then
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kerry-0.1.90/admin/cvs.sh new/kerry-0.1.901/admin/cvs.sh
--- old/kerry-0.1.90/admin/cvs.sh 2006-03-17 22:30:20.000000000 +0100
+++ new/kerry-0.1.901/admin/cvs.sh 2006-09-01 21:59:32.000000000 +0200
@@ -32,7 +32,7 @@
required_autoconf_version="2.53 or newer"
AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
case $AUTOCONF_VERSION in
- Autoconf*2.5* | autoconf*2.5* ) : ;;
+ Autoconf*2.5* | autoconf*2.5* | autoconf*2.6* ) : ;;
"" )
echo "*** AUTOCONF NOT FOUND!."
echo "*** KDE requires autoconf $required_autoconf_version"
@@ -47,7 +47,7 @@
AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
case $AUTOHEADER_VERSION in
- Autoconf*2.5* | autoheader*2.5* ) : ;;
+ Autoconf*2.5* | autoheader*2.5* | autoheader*2.6* ) : ;;
"" )
echo "*** AUTOHEADER NOT FOUND!."
echo "*** KDE requires autoheader $required_autoconf_version"
@@ -316,7 +316,7 @@
fi
fi
if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then
- VERSION="\"3.5.2\""
+ VERSION="\"3.5.4\""
fi
if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then
modulename=`pwd`;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kerry-0.1.90/config.h.in new/kerry-0.1.901/config.h.in
--- old/kerry-0.1.90/config.h.in 2006-06-23 07:38:46.000000000 +0200
+++ new/kerry-0.1.901/config.h.in 2006-09-01 22:00:00.000000000 +0200
@@ -159,22 +159,22 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-/* The size of a `char *', as computed by sizeof. */
+/* The size of `char *', as computed by sizeof. */
#undef SIZEOF_CHAR_P
-/* The size of a `int', as computed by sizeof. */
+/* The size of `int', as computed by sizeof. */
#undef SIZEOF_INT
-/* The size of a `long', as computed by sizeof. */
+/* The size of `long', as computed by sizeof. */
#undef SIZEOF_LONG
-/* The size of a `short', as computed by sizeof. */
+/* The size of `short', as computed by sizeof. */
#undef SIZEOF_SHORT
-/* The size of a `size_t', as computed by sizeof. */
+/* The size of `size_t', as computed by sizeof. */
#undef SIZEOF_SIZE_T
-/* The size of a `unsigned long', as computed by sizeof. */
+/* The size of `unsigned long', as computed by sizeof. */
#undef SIZEOF_UNSIGNED_LONG
/* Define to 1 if you have the ANSI C header files. */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kerry-0.1.90/configure.in new/kerry-0.1.901/configure.in
--- old/kerry-0.1.90/configure.in 2006-06-23 07:38:33.000000000 +0200
+++ new/kerry-0.1.901/configure.in 2006-09-01 21:59:49.000000000 +0200
@@ -40,7 +40,7 @@
AC_ARG_PROGRAM
dnl Automake doc recommends to do this only here. (Janos)
-AM_INIT_AUTOMAKE(kerry, "3.5.2") dnl searches for some needed programs
+AM_INIT_AUTOMAKE(kerry-0.1.90, "3.5.4") dnl searches for some needed programs
KDE_SET_PREFIX
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kerry-0.1.90/src/Makefile.am new/kerry-0.1.901/src/Makefile.am
--- old/kerry-0.1.90/src/Makefile.am 2006-06-21 10:31:01.000000000 +0200
+++ new/kerry-0.1.901/src/Makefile.am 2006-08-18 14:37:35.000000000 +0200
@@ -30,7 +30,7 @@
kerry_la_LDFLAGS = -Wl,-export-dynamic $(KDE_RPATH) $(all_libraries) -module $(KDE_PLUGIN) $(GLIB_LDFLAGS) $(LIBBEAGLE_LDFLAGS)
kerry_la_LIBADD = -lkio -lkonq $(LIB_KDEUI) $(LIBBEAGLE_LIBADD) $(GLIB_LIBADD)
-KDE_ICON = kerry
+KDE_ICON = kerry kerry_systemtray
autostartdir = $(datadir)/autostart
autostart_DATA = kerry.autostart.desktop beagled.desktop
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kerry-0.1.90/src/beagled.desktop new/kerry-0.1.901/src/beagled.desktop
--- old/kerry-0.1.90/src/beagled.desktop 2006-06-21 10:31:01.000000000 +0200
+++ new/kerry-0.1.901/src/beagled.desktop 2006-08-18 14:43:19.000000000 +0200
@@ -10,10 +10,12 @@
Name[ga]=Deamhan Beagle
Name[gl]=Servizo Beagle
Name[it]=Demone Beagle
+Name[ja]=Beagle デーモン
+Name[ka]=Beagle დემონი
Name[pt]=Servidor do Beagle
Name[sv]=Beagle-demon
Name[zh_CN]=Beagle 守护进程
-X-KDE-autostart-condition=kerryrc:Beagle:AutoStart:false
+X-KDE-autostart-condition=kerryrc:Beagle:AutoStart:true
X-KDE-StartupNotify=false
X-KDE-autostart-after=kerry
X-KDE-autostart-phase=2
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kerry-0.1.90/src/beaglesearch.cpp new/kerry-0.1.901/src/beaglesearch.cpp
--- old/kerry-0.1.90/src/beaglesearch.cpp 2006-06-21 10:31:01.000000000 +0200
+++ new/kerry-0.1.901/src/beaglesearch.cpp 2006-08-02 17:30:07.000000000 +0200
@@ -296,6 +296,10 @@
gint i;
gint nr_hits;
BeagleResultList results;
+
+ // This is necessary only once, not for each item
+ BeagleSnippetRequest *snippetrequest = beagle_snippet_request_new();
+ beagle_snippet_request_set_query(snippetrequest, query);
hits = beagle_hits_added_response_get_hits (response);
nr_hits = g_slist_length (hits);
@@ -364,8 +368,6 @@
}
}
- BeagleSnippetRequest *snippetrequest = beagle_snippet_request_new();
- beagle_snippet_request_set_query(snippetrequest, query);
beagle_snippet_request_set_hit(snippetrequest, hit);
GError *err = NULL;
@@ -377,7 +379,9 @@
}
else
result->snippet = new QString( beagle_snippet_response_get_snippet( BEAGLE_SNIPPET_RESPONSE(response)) );
- g_object_unref(snippetrequest);
+
+ if (response)
+ g_object_unref(response);
BeagleTimestamp *timestamp = beagle_hit_get_timestamp (BEAGLE_HIT (l->data));
time_t index_time;
@@ -388,6 +392,8 @@
results.append (result);
}
+
+ g_object_unref(snippetrequest);
if (current_instance != NULL)
current_instance->gotHits(results);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kerry-0.1.90/src/beaglesearch.h new/kerry-0.1.901/src/beaglesearch.h
--- old/kerry-0.1.90/src/beaglesearch.h 2006-06-21 10:31:01.000000000 +0200
+++ new/kerry-0.1.901/src/beaglesearch.h 2006-08-02 17:30:07.000000000 +0200
@@ -57,18 +57,35 @@
typedef QValueList<QString> PropertyList;
-typedef struct beagle_result_struct {
- QString *uri;
- QString *parent_uri;
- QString *source;
- PropertyList properties;
- QString hit_type;
- QString *mime_type;
- time_t last_index_time;
- double score;
- QString *snippet;
- TileGroup tilegroup;
-} beagle_result_struct;
+class beagle_result_struct {
+public:
+ beagle_result_struct () {
+ uri = NULL;
+ parent_uri = NULL;
+ source = NULL;
+ mime_type = NULL;
+ snippet = NULL;
+ }
+
+ ~beagle_result_struct () {
+ delete uri;
+ delete parent_uri;
+ delete source;
+ delete mime_type;
+ delete snippet;
+ }
+
+ QString *uri;
+ QString *parent_uri;
+ QString *source;
+ PropertyList properties;
+ QString hit_type;
+ QString *mime_type;
+ time_t last_index_time;
+ double score;
+ QString *snippet;
+ TileGroup tilegroup;
+};
typedef QPtrList BeagleResultList;
typedef QValueList<QString> BeagleVanishedURIList;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kerry-0.1.90/src/configdialog.cpp new/kerry-0.1.901/src/configdialog.cpp
--- old/kerry-0.1.90/src/configdialog.cpp 2006-06-21 10:31:01.000000000 +0200
+++ new/kerry-0.1.901/src/configdialog.cpp 2006-06-28 11:03:51.000000000 +0200
@@ -210,7 +210,7 @@
gb_general->setFlat(true);
QVBoxLayout* gb_general_layout = new QVBoxLayout( gb_general->layout(), KDialog::spacingHint() );
- startBeagle = new QCheckBox(i18n("Start search && and indexing services automatically"), gb_general);
+ startBeagle = new QCheckBox(i18n("Start search and indexing services automatically"), gb_general);
gb_general_layout->addWidget( startBeagle);
QHBoxLayout* qh_layout = new QHBoxLayout(gb_general_layout);
Binary files old/kerry-0.1.90/src/hi128-app-kerry.png and new/kerry-0.1.901/src/hi128-app-kerry.png differ
Binary files old/kerry-0.1.90/src/hi128-app-kerry_systemtray.png and new/kerry-0.1.901/src/hi128-app-kerry_systemtray.png differ
Binary files old/kerry-0.1.90/src/hi16-app-kerry.png and new/kerry-0.1.901/src/hi16-app-kerry.png differ
Binary files old/kerry-0.1.90/src/hi16-app-kerry_systemtray.png and new/kerry-0.1.901/src/hi16-app-kerry_systemtray.png differ
Binary files old/kerry-0.1.90/src/hi22-app-kerry.png and new/kerry-0.1.901/src/hi22-app-kerry.png differ
Binary files old/kerry-0.1.90/src/hi22-app-kerry_systemtray.png and new/kerry-0.1.901/src/hi22-app-kerry_systemtray.png differ
Binary files old/kerry-0.1.90/src/hi32-app-kerry.png and new/kerry-0.1.901/src/hi32-app-kerry.png differ
Binary files old/kerry-0.1.90/src/hi32-app-kerry_systemtray.png and new/kerry-0.1.901/src/hi32-app-kerry_systemtray.png differ
Binary files old/kerry-0.1.90/src/hi48-app-kerry.png and new/kerry-0.1.901/src/hi48-app-kerry.png differ
Binary files old/kerry-0.1.90/src/hi48-app-kerry_systemtray.png and new/kerry-0.1.901/src/hi48-app-kerry_systemtray.png differ
Binary files old/kerry-0.1.90/src/hi64-app-kerry.png and new/kerry-0.1.901/src/hi64-app-kerry.png differ
Binary files old/kerry-0.1.90/src/hi64-app-kerry_systemtray.png and new/kerry-0.1.901/src/hi64-app-kerry_systemtray.png differ
Binary files old/kerry-0.1.90/src/hisc-app-kerry.svgz and new/kerry-0.1.901/src/hisc-app-kerry.svgz differ
Binary files old/kerry-0.1.90/src/hisc-app-kerry_systemtray.svgz and new/kerry-0.1.901/src/hisc-app-kerry_systemtray.svgz differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kerry-0.1.90/src/kerry.autostart.desktop new/kerry-0.1.901/src/kerry.autostart.desktop
--- old/kerry-0.1.90/src/kerry.autostart.desktop 2006-06-21 10:31:01.000000000 +0200
+++ new/kerry-0.1.901/src/kerry.autostart.desktop 2006-08-22 13:34:25.000000000 +0200
@@ -10,6 +10,9 @@
GenericName[ga]=Cuardach Deisce
GenericName[gl]=Procuras no Escritório
GenericName[it]=Ricerca desktop
+GenericName[ja]=デスクトップ検索
+GenericName[ka]=სამუშაო მაგიდის ძიება
+GenericName[nl]=Desktop-zoekprogramma
GenericName[pt]=Pesquisa no Ambiente de Trabalho
GenericName[sk]=Vyhladávanie na pracovnej ploche
GenericName[sv]=Skrivbordssökning
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kerry-0.1.90/src/kerry.desktop new/kerry-0.1.901/src/kerry.desktop
--- old/kerry-0.1.90/src/kerry.desktop 2006-06-21 10:31:01.000000000 +0200
+++ new/kerry-0.1.901/src/kerry.desktop 2006-08-22 13:34:25.000000000 +0200
@@ -10,6 +10,9 @@
GenericName[ga]=Cuardach Deisce
GenericName[gl]=Procuras no Escritório
GenericName[it]=Ricerca desktop
+GenericName[ja]=デスクトップ検索
+GenericName[ka]=სამუშაო მაგიდის ძიება
+GenericName[nl]=Desktop-zoekprogramma
GenericName[pt]=Pesquisa no Ambiente de Trabalho
GenericName[sk]=Vyhladávanie na pracovnej ploche
GenericName[sv]=Skrivbordssökning
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kerry-0.1.90/src/kerryapp.cpp new/kerry-0.1.901/src/kerryapp.cpp
--- old/kerry-0.1.90/src/kerryapp.cpp 2006-06-21 10:31:01.000000000 +0200
+++ new/kerry-0.1.901/src/kerryapp.cpp 2006-08-18 15:15:01.000000000 +0200
@@ -109,14 +109,14 @@
KGlobalAccel* keys = globalKeys;
keys->insert( "Program:kerry", i18n("Kerry Beagle Search") );
- KShortcut showDialogShortcut = KShortcut(Key_F12);
- showDialogShortcut.append( KKey( ALT+Key_Space) );
+ KShortcut showDialogShortcut = KShortcut(ALT+Key_Space);
+// showDialogShortcut.append( KKey( Key_F12 ) );
keys->insert( "Show Kerry Dialog", i18n("Show Search Dialog"), QString::null, showDialogShortcut, showDialogShortcut, hitListWindow, SLOT(showSearchDialog()) );
keys->insert( "Search Primary Selection with Kerry", i18n("Search Primary Selection"), QString::null, CTRL+ALT+Key_Space, CTRL+ALT+Key_Space, this, SLOT(searchPrimarySelection()) );
globalKeys->readSettings();
globalKeys->updateConnections();
- sysTrayIcon->setPixmap(sysTrayIcon->loadIcon("filefind"));
+ sysTrayIcon->setPixmap(sysTrayIcon->loadIcon("kerry_systemtray"));
QToolTip::add(sysTrayIcon, i18n("Kerry Beagle Search (%1)").arg(globalKeys->shortcut("Show Kerry Dialog").seq(0).toString()));
sysTrayIcon->show();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kerry-0.1.90/src/searchdlg.cpp new/kerry-0.1.901/src/searchdlg.cpp
--- old/kerry-0.1.90/src/searchdlg.cpp 2006-06-21 10:31:01.000000000 +0200
+++ new/kerry-0.1.901/src/searchdlg.cpp 2006-08-18 14:52:23.000000000 +0200
@@ -977,7 +977,7 @@
for(uint i=0; i < tableHits->count(); ++i)
{
HitWidget* w = static_cast(tableHits->item(i));
- if (w && w->uri() == item->url().prettyURL() ) {
+ if (w && KURL(w->uri()).prettyURL() == item->url().prettyURL() ) {
w->icon->setPixmap(pix);
break;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org