[Libreoffice-commits] .: sfx2/source

[Caolán McNamara]

 sfx2/source/appl/shutdowniconunx.cxx |   16 ----------------
 1 file changed, 16 deletions(-)

New commits:
commit 0d1d596ccff6b1fd36cdf10e0bacd1e6d6c51048
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Dec 20 13:17:00 2010 +0000

    fix bad merge

diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx
index a255834..371140c 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;