summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2010-12-20 13:17:00 +0000
committerCaolán McNamara <caolanm@redhat.com>2010-12-20 13:17:00 +0000
commitb1a02bb3b3121384f444642da0bbf9b71850c993 (patch)
treee3b66250db5164bd384c04b2d7d3e4591b4167d9 /sfx2
parent2a567223baddab926294c02adae6893572ebdba4 (diff)
fix bad merge
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/appl/shutdowniconunx.cxx16
1 files changed, 0 insertions, 16 deletions
diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx
index a25583445fe6..371140c21e2c 100644
--- a/sfx2/source/appl/shutdowniconunx.cxx
+++ b/sfx2/source/appl/shutdowniconunx.cxx
@@ -343,22 +343,6 @@ static void notify_file_changed(GFileMonitor * /*gfilemonitor*/, GFile * /*arg1*
}
#endif
-#ifdef ENABLE_GIO
-/*
- * See rhbz#610103. If the quickstarter is running, then LibreOffice is
- * upgraded, then the old quickstarter is still running, but is now unreliable
- * as the old install has been deleted. A fairly intractable problem but we
- * can avoid much of the pain if we turn off the quickstarter if we detect
- * that it has been physically deleted.
-*/
-static void notify_file_changed(GFileMonitor * /*gfilemonitor*/, GFile * /*arg1*/,
- GFile * /*arg2*/, GFileMonitorEvent event_type, gpointer /*user_data*/)
-{
- if (event_type == G_FILE_MONITOR_EVENT_DELETED)
- exit_quickstarter_cb(GTK_WIDGET(pTrayIcon));
-}
-#endif
-
void SAL_DLLPUBLIC_EXPORT plugin_init_sys_tray()
{
::SolarMutexGuard aGuard;