[tracker] tracker-status-icon: Remove this application, it is a geek's toy
- From: mr src gnome org
- To: commits-list gnome org
- Cc:
- Subject: [tracker] tracker-status-icon: Remove this application, it is a geek's toy
- Date: Wed, 2 Feb 2011 15:34:55 +0000 (UTC)
commit 0f2789b39131a2a90b7459706b5b10ca131a0c39
Author: Martyn Russell <martyn lanedo com>
Date: Wed Feb 2 15:12:36 2011 +0000
tracker-status-icon: Remove this application, it is a geek's toy
More reasoning can be found in the bug report.
Fixes GB#631955, drop status icon use
configure.ac | 44 -
data/Makefile.am | 10 -
data/tracker-status-icon.desktop.in.in | 18 -
docs/manpages/Makefile.am | 4 -
po/POTFILES.in | 4 -
src/Makefile.am | 4 -
src/tracker-preferences/Makefile.am | 9 +-
src/tracker-preferences/tracker-preferences.ui | 107 +--
src/tracker-preferences/tracker-preferences.vala | 38 +-
src/tracker-status-icon/.gitignore | 3 -
src/tracker-status-icon/Makefile.am | 47 -
src/tracker-status-icon/tomboykeybinder.c | 255 -----
src/tracker-status-icon/tomboykeybinder.h | 25 -
src/tracker-status-icon/tracker-applet-default.png | Bin 1210 -> 0 bytes
.../tracker-applet-indexing1.png | Bin 1130 -> 0 bytes
.../tracker-applet-indexing2.png | Bin 1153 -> 0 bytes
src/tracker-status-icon/tracker-applet-paused.png | Bin 1098 -> 0 bytes
src/tracker-status-icon/tracker-icon-config.c | 314 ------
src/tracker-status-icon/tracker-icon-config.h | 66 --
src/tracker-status-icon/tracker-main.c | 92 --
src/tracker-status-icon/tracker-status-icon.c | 1043 --------------------
.../tracker-status-icon.desktop.in.in | 15 -
src/tracker-status-icon/tracker-status-icon.h | 52 -
23 files changed, 10 insertions(+), 2140 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e97cc30..c335e0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -412,20 +412,6 @@ PKG_CHECK_MODULES(TRACKER_PREFERENCES, [$TRACKER_PREFERENCES_REQUIRED],
[have_tracker_preferences=yes],
[have_tracker_preferences=no])
-# Check requirements for tracker-status-icon
-TRACKER_STATUS_ICON_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
- pango >= $PANGO_REQUIRED"
-
-PKG_CHECK_MODULES(TRACKER_STATUS_ICON, [$TRACKER_STATUS_ICON_REQUIRED],
- [have_tracker_status_icon=yes],
- [have_tracker_status_icon=no])
-
-TRACKER_STATUS_ICON_LIBS="$TRACKER_STATUS_ICON_LIBS -lX11"
-
# Check requirements for tracker-search-bar
TRACKER_SEARCH_BAR_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
gio-unix-2.0 >= $GLIB_REQUIRED
@@ -1210,33 +1196,6 @@ fi
AM_CONDITIONAL(HAVE_TAGLIB, test "x$have_taglib" = "xyes")
-##################################################################
-# Check for tracker-status-icon
-##################################################################
-
-AC_ARG_ENABLE([tracker-status-icon],
- AS_HELP_STRING([--enable-tracker-status-icon],
- [enable tracker-status-icon [[default=auto]]]),,
- [enable_tracker_status_icon=auto])
-
-if test "x$enable_tracker_status_icon" = "xyes" ; then
- if test "x$have_tracker_status_icon" != "xyes"; then
- AC_MSG_ERROR([Couldn't find tracker-status-icon dependencies ($TRACKER_STATUS_ICON_REQUIRED).])
- fi
-else
- if test "x$enable_tracker_status_icon" = "xno" ; then
- have_tracker_status_icon="no (disabled)"
- fi
-fi
-
-if test "x$have_tracker_status_icon" = "xyes"; then
- AC_DEFINE(HAVE_TRACKER_STATUS_ICON, [1], [Define to 1 if status icon is compiled])
-else
- AC_DEFINE(HAVE_TRACKER_STATUS_ICON, [0], [Define to 0 if status icon is not compiled])
-fi
-
-AM_CONDITIONAL(HAVE_TRACKER_STATUS_ICON, test "$have_tracker_status_icon" = "yes")
-
#################################################################
# Check for tracker-search-bar
##################################################################
@@ -2039,8 +1998,6 @@ AC_CONFIG_FILES([
src/miners/fs/Makefile
src/miners/rss/Makefile
src/miners/flickr/Makefile
- src/tracker-status-icon/Makefile
- src/tracker-status-icon/tracker-status-icon.desktop.in
src/tracker-store/Makefile
src/tracker-control/Makefile
src/tracker-extract/Makefile
@@ -2166,7 +2123,6 @@ Applications:
Build with SQLite FTS support: $have_tracker_fts
Build tracker-preferences: $have_tracker_preferences
- Build tracker-status-icon: $have_tracker_status_icon
Build tracker-explorer: $have_tracker_explorer
Build tracker-needle: $have_tracker_needle
Build tracker-search-bar: $have_tracker_search_bar
diff --git a/data/Makefile.am b/data/Makefile.am
index d62df53..c2587cb 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -3,10 +3,6 @@ include $(top_srcdir)/Makefile.decl
SUBDIRS = dbus languages icons ontologies miners
# First we fix the VERSION and libexecdir in the desktop files
-tracker-status-icon.desktop.in: tracker-status-icon.desktop.in.in
- @sed -e "s|@bindir[ ]|${bindir}|" \
- -e "s|@VERSION[ ]|${VERSION}|" $< > $@
-
tracker-store.desktop.in: tracker-store.desktop.in.in
@sed -e "s|@libexecdir[ ]|${libexecdir}|" \
-e "s|@VERSION[ ]|${VERSION}|" $< > $@
@@ -24,7 +20,6 @@ tracker-miner-rss.desktop.in: tracker-miner-rss.desktop.in.in
-e "s|@VERSION[ ]|${VERSION}|" $< > $@
desktop_in_in_files = \
- tracker-status-icon.desktop.in.in \
tracker-store.desktop.in.in \
tracker-miner-fs.desktop.in.in \
tracker-miner-flickr.desktop.in.in \
@@ -32,7 +27,6 @@ desktop_in_in_files = \
# Second take those new .in files and translate them
desktop_in_files = \
- tracker-status-icon.desktop.in \
tracker-store.desktop.in \
tracker-miner-fs.desktop.in \
tracker-miner-flickr.desktop.in \
@@ -44,10 +38,6 @@ autostart_DATA = \
tracker-store.desktop \
tracker-miner-fs.desktop
-if HAVE_TRACKER_STATUS_ICON
-autostart_DATA += tracker-status-icon.desktop
-endif
-
if HAVE_TRACKER_MINER_RSS
autostart_DATA += tracker-miner-rss.desktop
endif
diff --git a/docs/manpages/Makefile.am b/docs/manpages/Makefile.am
index 9c56c49..c807dec 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_STATUS_ICON
-ta = tracker-status-icon.1
-endif
-
if HAVE_TRACKER_PREFERENCES
tp = tracker-preferences.1
endif
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 71fa8e7..a2dcf05 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -9,7 +9,6 @@ data/miners/tracker-miner-rss.desktop.in.in
data/tracker-miner-flickr.desktop.in.in
data/tracker-miner-fs.desktop.in.in
data/tracker-miner-rss.desktop.in.in
-data/tracker-status-icon.desktop.in.in
data/tracker-store.desktop.in.in
[type: gettext/glade]examples/rss-reader/rss_viewer.ui
src/plugins/nautilus/tracker-tags-view.c
@@ -41,9 +40,6 @@ 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-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.vala
src/tracker-control/tracker-control.c
src/tracker-utils/tracker-import.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 53bb24e..f7f8b3c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -33,10 +33,6 @@ if HAVE_TRACKER_PREFERENCES
SUBDIRS += tracker-preferences
endif
-if HAVE_TRACKER_STATUS_ICON
-SUBDIRS += tracker-status-icon
-endif
-
if HAVE_TRACKER_NEEDLE
SUBDIRS += tracker-needle
endif
diff --git a/src/tracker-preferences/Makefile.am b/src/tracker-preferences/Makefile.am
index 73a7424..e380685 100644
--- a/src/tracker-preferences/Makefile.am
+++ b/src/tracker-preferences/Makefile.am
@@ -13,8 +13,7 @@ AM_VALAFLAGS = \
--pkg gtk+-2.0 --pkg gmodule-2.0 \
$(BUILD_VALAFLAGS) \
config.vapi \
- tracker-config.vapi \
- tracker-status-icon-config.vapi
+ tracker-config.vapi
AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
@@ -34,13 +33,11 @@ LDADD = \
tracker_preferences_SOURCES = \
tracker-preferences.vala \
- $(top_srcdir)/src/miners/fs/tracker-config.c \
- $(top_srcdir)/src/tracker-status-icon/tracker-icon-config.c
+ $(top_srcdir)/src/miners/fs/tracker-config.c
EXTRA_DIST = \
$(pkgdata_DATA) \
config.vapi \
- tracker-config.vapi \
- tracker-status-icon-config.vapi
+ tracker-config.vapi
CLEANFILES = $(desktop_DATA)
diff --git a/src/tracker-preferences/tracker-preferences.ui b/src/tracker-preferences/tracker-preferences.ui
index a30e0e9..c17030f 100644
--- a/src/tracker-preferences/tracker-preferences.ui
+++ b/src/tracker-preferences/tracker-preferences.ui
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy toplevel-contextual -->
@@ -38,13 +38,11 @@
<property name="title" translatable="yes">Indexing Preferences</property>
<property name="icon_name">system-search</property>
<property name="type_hint">normal</property>
- <property name="has_separator">False</property>
<signal name="close" handler="gtk_main_quit"/>
<signal name="delete_event" handler="gtk_main_quit"/>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox1">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkNotebook" id="notebook">
@@ -53,9 +51,7 @@
<property name="border_width">6</property>
<child>
<object class="GtkVBox" id="vbox1">
- <property name="visible">True</property>
<property name="border_width">12</property>
- <property name="orientation">vertical</property>
<property name="spacing">18</property>
<child>
<object class="GtkFrame" id="frame_general">
@@ -70,7 +66,6 @@
<child>
<object class="GtkVBox" id="vbox_general">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<child>
<object class="GtkHBox" id="hbox_delay">
<property name="visible">True</property>
@@ -95,7 +90,7 @@
<object class="GtkSpinButton" id="spinbutton_delay">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â??</property>
<property name="adjustment">adjustment_delay</property>
<property name="climb_rate">1</property>
<property name="snap_to_ticks">True</property>
@@ -148,86 +143,7 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame1">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment" id="alignment2">
- <property name="visible">True</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkVBox" id="vbox9">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkRadioButton" id="radiobutton_display_never">
- <property name="label" translatable="yes">_Never display icon</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="radiobutton_visibility_toggled_cb"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="radiobutton_display_active">
- <property name="label" translatable="yes">_Only display when indexing content</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">radiobutton_display_never</property>
- <signal name="toggled" handler="radiobutton_visibility_toggled_cb"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="radiobutton_display_always">
- <property name="label" translatable="yes">Al_ways display icon</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">radiobutton_display_never</property>
- <signal name="toggled" handler="radiobutton_visibility_toggled_cb"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label8">
- <property name="visible">True</property>
- <property name="xpad">3</property>
- <property name="label" translatable="yes"><b>Notification area</b></property>
- <property name="use_markup">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
+ <placeholder/>
</child>
<child>
<placeholder/>
@@ -247,7 +163,6 @@
<object class="GtkVBox" id="vbox10">
<property name="visible">True</property>
<property name="border_width">12</property>
- <property name="orientation">vertical</property>
<property name="spacing">18</property>
<child>
<object class="GtkFrame" id="frame_indexing">
@@ -262,13 +177,13 @@
<child>
<object class="GtkVBox" id="vbox_indexing">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="checkbutton_enable_monitoring">
<property name="label" translatable="yes">_Monitor file and directory changes</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="has_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="active">True</property>
@@ -390,11 +305,9 @@
<child>
<object class="GtkVBox" id="vbox_general1">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<child>
<object class="GtkVBox" id="vbox11">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="label_disk_space_limit">
<property name="visible">True</property>
@@ -581,7 +494,6 @@
<object class="GtkVBox" id="vbox2">
<property name="visible">True</property>
<property name="border_width">12</property>
- <property name="orientation">vertical</property>
<property name="spacing">18</property>
<child>
<object class="GtkFrame" id="frame_index_recursive_directories">
@@ -596,7 +508,6 @@
<child>
<object class="GtkVBox" id="vbox7">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label_index_recursively">
@@ -639,7 +550,6 @@
<child>
<object class="GtkVBox" id="vbox23">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkButton" id="button_index_recursively_add">
@@ -740,7 +650,6 @@
<child>
<object class="GtkVBox" id="vbox3">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label_index_single">
@@ -783,7 +692,6 @@
<child>
<object class="GtkVBox" id="vbox5">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkButton" id="button_index_single_add">
@@ -873,7 +781,6 @@
<object class="GtkVBox" id="vbox4">
<property name="visible">True</property>
<property name="border_width">12</property>
- <property name="orientation">vertical</property>
<property name="spacing">18</property>
<child>
<object class="GtkFrame" id="frame_ignored_directories">
@@ -893,7 +800,6 @@
<child>
<object class="GtkVBox" id="vbox_ignored_directories">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label10">
@@ -935,7 +841,6 @@
<child>
<object class="GtkVBox" id="vbox25">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkButton" id="button_ignored_directories_globs_add">
@@ -1012,7 +917,6 @@
<child>
<object class="GtkVBox" id="vbox_ignored_directories_with_content">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label5">
@@ -1054,7 +958,6 @@
<child>
<object class="GtkVBox" id="vbox8">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkButton" id="button_ignored_directories_with_content_add">
@@ -1142,7 +1045,6 @@
<child>
<object class="GtkVBox" id="vbox_ignored_files">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label11">
@@ -1187,7 +1089,6 @@ Most commonly this is used to ignore directories like *~, *.o, *.la, etc</proper
<child>
<object class="GtkVBox" id="vbox6">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkButton" id="button_ignored_files_add">
diff --git a/src/tracker-preferences/tracker-preferences.vala b/src/tracker-preferences/tracker-preferences.vala
index a637b4d..0ba15ef 100644
--- a/src/tracker-preferences/tracker-preferences.vala
+++ b/src/tracker-preferences/tracker-preferences.vala
@@ -25,7 +25,6 @@ using GLib;
using Tracker;
public static Config config = null;
-public static IconConfig icon_config = null;
public const string HOME_STRING = "$HOME";
@@ -55,26 +54,6 @@ public static RadioButton radiobutton_display_never;
public static RadioButton radiobutton_display_active;
public static RadioButton radiobutton_display_always;
-public static void radiobutton_visibility_toggled_cb (RadioButton source) {
- if (radiobutton_display_never.active) {
- icon_config.visibility = 0;
- } else if (radiobutton_display_active.active) {
- icon_config.visibility = 1;
- } else {
- icon_config.visibility = 2;
- }
-}
-
-public static void initialize_visibility_radiobutton () {
- if (icon_config.visibility == 0) {
- radiobutton_display_never.active = true;
- } else if (icon_config.visibility == 1) {
- radiobutton_display_active.active = true;
- } else {
- radiobutton_display_always.active = true;
- }
-}
-
public static void spinbutton_delay_value_changed_cb (SpinButton source) {
config.initial_sleep = source.get_value_as_int ();
}
@@ -286,7 +265,6 @@ public static void button_apply_clicked_cb (Button source) {
config.removable_days_threshold = (int) hscale_drop_device_threshold.get_value ();
config.save ();
- icon_config.save ();
/* TODO: restart the Application and Files miner (no idea how to cleanly do this atm) */
}
@@ -355,7 +333,6 @@ static int main (string[] args) {
try {
config = new Config.with_domain ("tracker-miner-fs");
- icon_config = new IconConfig.with_domain ("tracker-status-icon");
var builder = new Builder ();
builder.add_from_file (TRACKER_DATADIR + Path.DIR_SEPARATOR_S + "tracker-preferences.ui");
@@ -386,18 +363,9 @@ static int main (string[] args) {
notebook = builder.get_object ("notebook") as Notebook;
- radiobutton_display_never = builder.get_object ("radiobutton_display_never") as RadioButton;
- radiobutton_display_active = builder.get_object ("radiobutton_display_active") as RadioButton;
- radiobutton_display_always = builder.get_object ("radiobutton_display_always") as RadioButton;
- initialize_visibility_radiobutton ();
-
- /* Note: if the General tab ever has more config parameters than those
- * of the status icon, then don't remove the page, just the status-icon
- * related parameters */
- if (!HAVE_TRACKER_STATUS_ICON) {
- /* Page #0 is the Contents page */
- notebook.remove_page (0);
- }
+ // We hide this page because it contains the start up
+ // delay which is not necessary to display for most people.
+ notebook.remove_page (0);
treeview_index_recursively = builder.get_object ("treeview_index_recursively") as TreeView;
treeview_index_single = builder.get_object ("treeview_index_single") as TreeView;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
