GNOME.org
 

[tracker/needle: 56/56] tracker-search-tool: Removed and replaced by tracker-needle

commit 70abdab52b508a3fc31577d48a065442dbb70d00
Author: Martyn Russell <martyn lanedo com>
Date:   Tue Dec 14 11:23:15 2010 +0000

    tracker-search-tool: Removed and replaced by tracker-needle
    
    This commit removes tracker-search-tool and fixes some of the
    final things for tracker-needle which were moved over from
    tracker-search-tool such as:
    
     - desktop file
     - man page
     - po/POTFILES changes
     - any places which start t-s-t (like tracker-status-icon)

 configure.ac                                       |   49 +--
 docs/manpages/Makefile.am                          |   10 +-
 docs/manpages/tracker-needle.1                     |   19 +
 docs/manpages/tracker-search-tool.1                |   26 --
 po/POTFILES.in                                     |    9 +-
 po/POTFILES.skip                                   |    7 +-
 src/Makefile.am                                    |    5 +-
 src/tracker-needle/.gitignore                      |    3 +
 src/tracker-needle/Makefile.am                     |    9 +
 .../tracker-needle.desktop.in.in}                  |    8 +-
 src/tracker-search-tool/.gitignore                 |    3 -
 src/tracker-search-tool/Makefile.am                |   57 ---
 src/tracker-search-tool/thumbnail_frame.png        |  Bin 908 -> 0 bytes
 src/tracker-search-tool/tracker-category-view.gs   |  109 -----
 src/tracker-search-tool/tracker-entry.gs           |  134 ------
 src/tracker-search-tool/tracker-metadata-tile.gs   |  458 --------------------
 src/tracker-search-tool/tracker-query.gs           |  100 -----
 src/tracker-search-tool/tracker-result-grid.gs     |  203 ---------
 src/tracker-search-tool/tracker-search-tool.gs     |  167 -------
 src/tracker-search-tool/tracker-utils.gs           |  194 ---------
 src/tracker-search-tool/tst.ui                     |  104 -----
 src/tracker-status-icon/tracker-status-icon.c      |   12 +-
 22 files changed, 56 insertions(+), 1630 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f0ad13c..ff38369 100644
--- a/configure.ac
+++ b/configure.ac
@@ -420,22 +420,6 @@ PKG_CHECK_MODULES(TRACKER_NEEDLE, [$TRACKER_NEEDLE_REQUIRED],
                   [have_tracker_needle=yes],
                   [have_tracker_needle=no])
 
-# Check requirements for tracker-search-tool
-TRACKER_SEARCH_TOOL_REQUIRED="glib-2.0       >= $GLIB_REQUIRED
-                              gio-unix-2.0   >= $GLIB_REQUIRED
-                              gthread-2.0    >= $GLIB_REQUIRED
-                              gmodule-2.0    >= $GLIB_REQUIRED
-                              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"
-
-PKG_CHECK_MODULES(TRACKER_SEARCH_TOOL, [$TRACKER_SEARCH_TOOL_REQUIRED],
-                  [have_tracker_search_tool=yes],
-                  [have_tracker_search_tool=no])
-
 # Check requirements for tracker-preferences
 TRACKER_PREFERENCES_REQUIRED="glib-2.0       >= $GLIB_REQUIRED
                               gio-unix-2.0   >= $GLIB_REQUIRED
@@ -1324,34 +1308,13 @@ else
    have_tracker_needle="no  (disabled)"
 fi
 
-AM_CONDITIONAL(HAVE_TRACKER_NEEDLE, test "$have_tracker_needle" = "yes")
-
-##################################################################
-# Check for tracker-search-tool
-##################################################################
-
-AC_ARG_ENABLE(tracker-search-tool,
-              AS_HELP_STRING([--enable-tracker-search-tool],
-                             [enable tracker-search-tool [[default=auto]]]),,
-              [enable_tracker_search_tool=auto])
-
-if test "x$enable_tracker_search_tool" = "xyes"; then
-   if test "x$have_tracker_search_tool" != "xyes"; then
-      AC_MSG_ERROR([Couldn't find tracker-search-tool dependencies ($TRACKER_SEARCH_TOOL_REQUIRED).])
-   fi
-else
-   if test "x$enable_tracker_search_tool" = "xno"; then
-      have_tracker_search_tool="no  (disabled)"
-   fi
-fi
-
-if test "x$have_tracker_search_tool" = "xyes"; then
-   AC_DEFINE(HAVE_TRACKER_SEARCH_TOOL, [1], [Define to 1 if t-s-t is compiled])
+if test "x$have_tracker_needle" = "xyes"; then
+   AC_DEFINE(HAVE_TRACKER_NEEDLE, [1], [Define to 1 if tracker-needle is compiled])
 else
-   AC_DEFINE(HAVE_TRACKER_SEARCH_TOOL, [0], [Define to 0 if t-s-t is not compiled])
+   AC_DEFINE(HAVE_TRACKER_NEEDLE, [0], [Define to 0 if tracker-needle is not compiled])
 fi
 
-AM_CONDITIONAL(HAVE_TRACKER_SEARCH_TOOL, test "$have_tracker_search_tool" = "yes")
+AM_CONDITIONAL(HAVE_TRACKER_NEEDLE, test "$have_tracker_needle" = "yes")
 
 ##################################################################
 # Check for tracker-preferences
@@ -2094,10 +2057,9 @@ AC_CONFIG_FILES([
 	src/tracker-preferences/Makefile
 	src/tracker-preferences/tracker-preferences.desktop.in
 	src/tracker-search-bar/Makefile
-	src/tracker-search-tool/Makefile
-	src/tracker-search-tool/tracker-search-tool.desktop.in
 	src/tracker-explorer/Makefile
 	src/tracker-needle/Makefile
+	src/tracker-needle/tracker-needle.desktop.in
 	src/tracker-utils/Makefile
 	src/tracker-writeback/Makefile
 	src/plugins/Makefile
@@ -2211,7 +2173,6 @@ Applications:
 
 	Build with SQLite FTS support:          $have_tracker_fts
 
-	Build tracker-search-tool:              $have_tracker_search_tool
 	Build tracker-preferences:              $have_tracker_preferences
 	Build tracker-status-icon:              $have_tracker_status_icon
 	Build tracker-explorer:                 $have_tracker_explorer
diff --git a/docs/manpages/Makefile.am b/docs/manpages/Makefile.am
index 1550a5b..9c56c49 100644
--- a/docs/manpages/Makefile.am
+++ b/docs/manpages/Makefile.am
@@ -4,10 +4,6 @@ if HAVE_TRACKER_SEARCH_BAR
 tsb = tracker-search-bar.1
 endif
 
-if HAVE_TRACKER_SEARCH_TOOL
-tst = tracker-search-tool.1
-endif
-
 if HAVE_TRACKER_STATUS_ICON
 ta = tracker-status-icon.1
 endif
@@ -16,6 +12,10 @@ if HAVE_TRACKER_PREFERENCES
 tp = tracker-preferences.1
 endif
 
+if HAVE_TRACKER_NEEDLE
+tn = tracker-needle.1
+endif
+
 man_MANS =                                             \
 	tracker-extract.1                              \
 	tracker-extract.cfg.5                          \
@@ -33,7 +33,7 @@ man_MANS =                                             \
 	tracker-store.cfg.5                            \
 	tracker-tag.1                                  \
 	$(tsb)                                         \
-	$(tst)                                         \
+	$(tn)                                          \
 	$(ta)                                          \
 	$(tp)
 
diff --git a/docs/manpages/tracker-needle.1 b/docs/manpages/tracker-needle.1
new file mode 100644
index 0000000..b76b100
--- /dev/null
+++ b/docs/manpages/tracker-needle.1
@@ -0,0 +1,19 @@
+.TH tracker-needle 1 "December, 2010" GNU "User Commands"
+
+.SH NAME
+tracker-needle \- GNOME user interface similar to tracker-search
+
+.SH SYNOPSIS
+.B tracker-needle
+
+.SH DESCRIPTION
+.B tracker-needle
+is a graphical front end for Tracker which has similar features to
+.BR tracker-search (1).
+
+.SH SEE ALSO
+.BR tracker-search (1),
+.BR tracker-sparql (1),
+.BR tracker-store (1),
+
+.BR http://live.gnome.org/Tracker/SupportedFormats
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0aea997..9b8cbe5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -30,17 +30,12 @@ src/miners/rss/tracker-miner-rss.c
 src/tracker-preferences/tracker-preferences.desktop.in.in
 src/tracker-preferences/tracker-preferences.vala
 [type: gettext/glade]src/tracker-preferences/tracker-preferences.ui
+src/tracker-needle/tracker-needle.desktop.in.in
+[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/tracker-results-window.c
 [type: gettext/glade]src/tracker-search-bar/tracker-search-bar.ui
-src/tracker-search-tool/tracker-category-view.gs
-src/tracker-search-tool/tracker-entry.gs
-src/tracker-search-tool/tracker-metadata-tile.gs
-src/tracker-search-tool/tracker-search-tool.desktop.in.in
-src/tracker-search-tool/tracker-search-tool.gs
-src/tracker-search-tool/tracker-utils.gs
-[type: gettext/glade]src/tracker-search-tool/tst.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
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 1297294..12ca309 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -7,11 +7,6 @@ data/tracker-status-icon.desktop.in
 data/tracker-store.desktop.in
 src/tracker-preferences/tracker-preferences.c
 src/tracker-preferences/tracker-preferences.desktop.in
+src/tracker-needle/tracker-needle.desktop.in
 src/tracker-search-bar/GNOME_Search_Bar_Applet.server.in
-src/tracker-search-tool/tracker-category-view.c
-src/tracker-search-tool/tracker-entry.c
-src/tracker-search-tool/tracker-metadata-tile.c
-src/tracker-search-tool/tracker-search-tool.c
-src/tracker-search-tool/tracker-search-tool.desktop.in
-src/tracker-search-tool/tracker-utils.c
 src/tracker-status-icon/tracker-status-icon.desktop.in
diff --git a/src/Makefile.am b/src/Makefile.am
index 2a7ddef..9e377f2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,7 +26,6 @@ SUBDIRS =                                              \
 	tracker-utils                                  \
 	tracker-extract                                \
 	tracker-writeback                              \
-	tracker-needle                                 \
 	vapi
 
 if HAVE_TRACKER_PREFERENCES
@@ -37,8 +36,8 @@ if HAVE_TRACKER_STATUS_ICON
 SUBDIRS += tracker-status-icon
 endif
 
-if HAVE_TRACKER_SEARCH_TOOL
-SUBDIRS += tracker-search-tool
+if HAVE_TRACKER_NEEDLE
+SUBDIRS += tracker-needle
 endif
 
 if HAVE_TRACKER_SEARCH_BAR
diff --git a/src/tracker-needle/.gitignore b/src/tracker-needle/.gitignore
new file mode 100644
index 0000000..3d157f6
--- /dev/null
+++ b/src/tracker-needle/.gitignore
@@ -0,0 +1,3 @@
+tracker-needle
+*.c
+*.desktop.in
diff --git a/src/tracker-needle/Makefile.am b/src/tracker-needle/Makefile.am
index 628a626..0b83ed7 100644
--- a/src/tracker-needle/Makefile.am
+++ b/src/tracker-needle/Makefile.am
@@ -33,13 +33,22 @@ tracker_needle_SOURCES =                               \
 	tracker-needle.vala                            \
 	tracker-view.vala
 
+ INTLTOOL_DESKTOP_RULE@
+
 uidir = $(datadir)/tracker
 ui_DATA = tracker-needle.ui
 
+desktopdir = $(datadir)/applications
+desktop_DATA = tracker-needle.desktop
+
 BUILT_SOURCES =                                        \
 	tracker_needle_vala.stamp
 
+CLEANFILES =                                           \
+	$(desktop_DATA)
+
 EXTRA_DIST =                                           \
 	$(ui_DATA)                                     \
+	$(desktop_DATA)                                \
 	config.vapi
 
diff --git a/src/tracker-search-tool/tracker-search-tool.desktop.in.in b/src/tracker-needle/tracker-needle.desktop.in.in
similarity index 59%
rename from src/tracker-search-tool/tracker-search-tool.desktop.in.in
rename to src/tracker-needle/tracker-needle.desktop.in.in
index 8c64c08..df03de4 100644
--- a/src/tracker-search-tool/tracker-search-tool.desktop.in.in
+++ b/src/tracker-needle/tracker-needle.desktop.in.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
-_Name=Tracker Search Tool
-_Comment=Locate documents and folders on this computer by name or content using Tracker
-Exec=tracker-search-tool
+_Name=Desktop Search
+_Comment=Find what you're looking for on this computer by name or content using Tracker
+Exec=tracker-needle
 Icon=system-search
 Terminal=false
 Type=Application
@@ -9,6 +9,6 @@ Categories=GTK;Utility;
 StartupNotify=true
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=tracker
-X-GNOME-Bugzilla-Component=Tracker Search Tool
+X-GNOME-Bugzilla-Component=Tracker Needle
 X-GNOME-Bugzilla-Version= VERSION@
 
diff --git a/src/tracker-status-icon/tracker-status-icon.c b/src/tracker-status-icon/tracker-status-icon.c
index cb88915..531f3ab 100644
--- a/src/tracker-status-icon/tracker-status-icon.c
+++ b/src/tracker-status-icon/tracker-status-icon.c
@@ -152,7 +152,7 @@ keybinding_activated_cb (gchar    *keybinding,
 	GdkScreen *screen;
 
 	screen = gtk_status_icon_get_screen (GTK_STATUS_ICON (icon));
-	launch_application_on_screen (screen, "tracker-search-tool");
+	launch_application_on_screen (screen, "tracker-needle");
 }
 
 static void
@@ -709,13 +709,13 @@ context_menu_pause_cb (GtkMenuItem *item,
 	update_icon_status (icon);
 }
 
-#if HAVE_TRACKER_SEARCH_TOOL
+#if HAVE_TRACKER_NEEDLE
 static void
 context_menu_search_cb (GtkMenuItem *item,
                         gpointer     user_data)
 {
 	launch_application_on_screen (gtk_widget_get_screen (GTK_WIDGET (item)),
-	                              "tracker-search-tool");
+	                              "tracker-needle");
 }
 #endif
 
@@ -834,8 +834,8 @@ status_icon_initialize_miners_menu (TrackerStatusIcon *icon)
 
 	priv = TRACKER_STATUS_ICON_GET_PRIVATE (icon);
 
-#if HAVE_TRACKER_SEARCH_TOOL
-	if (g_find_program_in_path ("tracker-search-tool")) {
+#if HAVE_TRACKER_NEEDLE
+	if (g_find_program_in_path ("tracker-needle")) {
 		GtkWidget *image;
 
 		item = gtk_image_menu_item_new_with_mnemonic (_("_Search"));
@@ -852,7 +852,7 @@ status_icon_initialize_miners_menu (TrackerStatusIcon *icon)
 		gtk_menu_shell_append (GTK_MENU_SHELL (priv->miner_menu), item);
 		gtk_widget_show (item);
 	}
-#endif
+#endif /* HAVE_TRACKER_NEEDLE */
 
 	/* miner entries */
 	miners = tracker_miner_manager_get_available (priv->manager);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]