[tracker: 2/2] Merge branch 'no-bonobo'

[mr src gnome org]

commit edd52c83dc8546eda76bbdf7bbdaf5b1fc215f6a
Merge: 0f2789b 683d383
Author: Martyn Russell <martyn lanedo com>
Date:   Wed Feb 2 15:35:58 2011 +0000

    Merge branch 'no-bonobo'

 configure.ac                                       |    2 +-
 po/POTFILES.in                                     |    3 +-
 .../GNOME_Search_Bar_Applet.server.in.in           |   24 -------
 src/tracker-search-bar/GNOME_Search_Bar_Applet.xml |    7 --
 src/tracker-search-bar/Makefile.am                 |   58 ++++++++++------
 .../org.gnome.panel.SearchBar.panel-applet.in.in   |   15 ++++
 ....gnome.panel.applet.SearchBarFactory.service.in |    3 +
 src/tracker-search-bar/tracker-applet.c            |   72 +++++++++++++-------
 src/tracker-search-bar/tracker-search-bar-menu.xml |    1 +
 9 files changed, 106 insertions(+), 79 deletions(-)
---
diff --cc configure.ac
index c335e0f,602f424..c9decab
--- a/configure.ac
+++ b/configure.ac
@@@ -420,8 -459,10 +420,8 @@@ TRACKER_SEARCH_BAR_REQUIRED="glib-2.
                               gtk+-2.0       >= $GTK_REQUIRED
                               gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED
                               pango          >= $PANGO_REQUIRED
 -                             dbus-1         >= $DBUS_REQUIRED
 -                             dbus-glib-1    >= $DBUS_GLIB_REQUIRED
  			     gee-1.0        >= $GEE_REQUIRED
-                              libpanelapplet-2.0"
+                              libpanelapplet-3.0"
  
  PKG_CHECK_MODULES(TRACKER_SEARCH_BAR, [$TRACKER_SEARCH_BAR_REQUIRED],
                    [have_tracker_search_bar=yes],
diff --cc po/POTFILES.in
index a2dcf05,c958a8d..ca432f6
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@@ -36,11 -37,13 +36,10 @@@ src/tracker-needle/tracker-taglist.val
  src/tracker-needle/tracker-utils.vala
  src/tracker-needle/tracker-view.vala
  [type: gettext/glade]src/tracker-needle/tracker-needle.ui
- src/tracker-search-bar/GNOME_Search_Bar_Applet.server.in.in
- src/tracker-search-bar/GNOME_Search_Bar_Applet.xml
+ src/tracker-search-bar/org.gnome.panel.SearchBar.panel-applet.in.in
  src/tracker-search-bar/tracker-results-window.c
  [type: gettext/glade]src/tracker-search-bar/tracker-search-bar.ui
 -src/tracker-status-icon/tracker-main.c
 -src/tracker-status-icon/tracker-status-icon.c
 -src/tracker-status-icon/tracker-status-icon.desktop.in.in
 -src/tracker-store/tracker-main.c
 +src/tracker-store/tracker-main.vala
  src/tracker-control/tracker-control.c
  src/tracker-utils/tracker-import.c
  src/tracker-utils/tracker-info.c