From acf6f31c9c6e4196f8552ac5882c9ed3ef1d5eb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Thu, 25 Nov 2010 13:56:10 +0000
Subject: [PATCH] Related: rhbz#610103 fix to apply

---
 exit.quickstarter.when.deleted.patch | 62 ++++++++++++----------------
 1 file changed, 26 insertions(+), 36 deletions(-)

diff --git a/exit.quickstarter.when.deleted.patch b/exit.quickstarter.when.deleted.patch
index 411ac5d..67f1798 100644
--- a/exit.quickstarter.when.deleted.patch
+++ b/exit.quickstarter.when.deleted.patch
@@ -28,7 +28,7 @@ index e31c32f..1b78f9b 100644
  // Cut/paste from vcl/inc/svids.hrc
  #define SV_ICON_SMALL_START                 25000
  
-@@ -39,6 +43,9 @@ static EggTrayIcon *pTrayIcon;
+@@ -39,6 +43,9 @@
  static GtkWidget *pExitMenuItem = NULL;
  static GtkWidget *pOpenMenuItem = NULL;
  static GtkWidget *pDisableMenuItem = NULL;
@@ -38,7 +38,28 @@ index e31c32f..1b78f9b 100644
  
  static void open_url_cb( GtkWidget *, gpointer data )
  {
-@@ -358,6 +365,22 @@ extern "C" {
+@@ -280,6 +287,20 @@
+           pShutdownIcon->GetResString( STR_QUICKSTART_EXIT ),
+           G_CALLBACK( exit_quickstarter_cb ) );
+ 
++#ifdef ENABLE_GIO
++    GFile* pFile = NULL;
++    rtl::OUString sLibraryFileUrl;
++    if (osl::Module::getUrlFromAddress(plugin_init_sys_tray, sLibraryFileUrl))
++        pFile = g_file_new_for_uri(rtl::OUStringToOString(sLibraryFileUrl, RTL_TEXTENCODING_UTF8).getStr());
++
++    if (pFile)
++    {
++        if ((pMonitor = g_file_monitor_file(pFile, G_FILE_MONITOR_NONE, NULL, NULL)))
++            g_signal_connect(pMonitor, "changed", (GCallback)notify_file_changed, NULL); 
++        g_object_unref(pFile);
++    }
++#endif
++
+     gtk_widget_show_all( pMenu );
+ }
+ 
+@@ -354,6 +375,22 @@
      }
  }
  
@@ -61,31 +82,10 @@ index e31c32f..1b78f9b 100644
  void SAL_DLLPUBLIC_EXPORT plugin_init_sys_tray()
  {
      ::SolarMutexGuard aGuard;
-@@ -403,6 +426,20 @@ void SAL_DLLPUBLIC_EXPORT plugin_init_sys_tray()
- 
-     g_signal_connect(GTK_WIDGET(pTrayIcon), "destroy",
-             G_CALLBACK(exit_quickstarter_cb), NULL);
-+
-+#ifdef ENABLE_GIO
-+    GFile* pFile = NULL;
-+    rtl::OUString sLibraryFileUrl;
-+    if (osl::Module::getUrlFromAddress(plugin_init_sys_tray, sLibraryFileUrl))
-+        pFile = g_file_new_for_uri(rtl::OUStringToOString(sLibraryFileUrl, RTL_TEXTENCODING_UTF8).getStr());
-+
-+    if (pFile)
-+    {
-+        if ((pMonitor = g_file_monitor_file(pFile, G_FILE_MONITOR_NONE, NULL, NULL)))
-+            g_signal_connect(pMonitor, "changed", (GCallback)notify_file_changed, NULL); 
-+        g_object_unref(pFile);
-+    }
-+#endif
- }
- 
- void SAL_DLLPUBLIC_EXPORT plugin_shutdown_sys_tray()
-@@ -411,6 +448,17 @@ void SAL_DLLPUBLIC_EXPORT plugin_shutdown_sys_tray()
+@@ -403,6 +440,16 @@
+     ::SolarMutexGuard aGuard;
      if( !pTrayIcon )
          return;
- 
 +#ifdef ENABLE_GIO
 +    if (pMonitor)
 +    {
@@ -96,16 +96,6 @@ index e31c32f..1b78f9b 100644
 +        pMonitor = NULL;
 +    }
 +#endif
-+
-     /* we have to set pTrayIcon to NULL now, because gtk_widget_destroy
-      * causes calling exit_quickstarter_cb (which then calls this func.)
-      * again -> crash.
-@@ -419,7 +467,7 @@ void SAL_DLLPUBLIC_EXPORT plugin_shutdown_sys_tray()
-      */
-     GtkWidget* const pIcon = GTK_WIDGET( pTrayIcon );
+     gtk_widget_destroy( GTK_WIDGET( pTrayIcon ) );
      pTrayIcon = NULL;
--	gtk_widget_destroy( pIcon );
-+    gtk_widget_destroy( pIcon );
- 
      pExitMenuItem = NULL;
-     pOpenMenuItem = NULL;