From 32af4b5f3ae56afaf0fcf9a1b08e220723ff7be8 Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@suse.com>
Date: Wed, 2 Nov 2011 17:42:23 +0000
Subject: more fpicker related gtk cleanup

---
 fpicker/source/unx/gnome/SalGtkFilePicker.hxx |  2 +-
 fpicker/source/unx/gnome/SalGtkPicker.cxx     | 19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'fpicker')

diff --git a/fpicker/source/unx/gnome/SalGtkFilePicker.hxx b/fpicker/source/unx/gnome/SalGtkFilePicker.hxx
index e15de9c08df6..832e9445c342 100644
--- a/fpicker/source/unx/gnome/SalGtkFilePicker.hxx
+++ b/fpicker/source/unx/gnome/SalGtkFilePicker.hxx
@@ -108,7 +108,7 @@ class SalGtkFilePicker :
         virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle )
             throw( ::com::sun::star::uno::RuntimeException );
 
-        virtual sal_Int16 SAL_CALL execute(  )
+        virtual sal_Int16 SAL_CALL execute()
             throw( ::com::sun::star::uno::RuntimeException );
 
         //------------------------------------------------------------------------------------
diff --git a/fpicker/source/unx/gnome/SalGtkPicker.cxx b/fpicker/source/unx/gnome/SalGtkPicker.cxx
index e3283e3f13ab..d52c2c60e37d 100644
--- a/fpicker/source/unx/gnome/SalGtkPicker.cxx
+++ b/fpicker/source/unx/gnome/SalGtkPicker.cxx
@@ -118,18 +118,17 @@ rtl::OString SalGtkPicker::unicodetouri(const rtl::OUString &rURL)
     return sURL;
 }
 
-gboolean canceldialog(RunDialog *pDialog)
-{
-    GdkThreadLock lock;
-
-    pDialog->cancel();
-    return false;
-}
-
 extern "C"
 {
     struct Display;
     extern GdkDisplay* gdk_x11_lookup_xdisplay (void*xdisplay);
+
+    static gboolean canceldialog(RunDialog *pDialog)
+    {
+        GdkThreadLock lock;
+        pDialog->cancel();
+        return false;
+    }
 }
 
 RunDialog::RunDialog( GtkWidget *pDialog, uno::Reference< awt::XExtendedToolkit >& rToolkit,
@@ -176,9 +175,9 @@ RunDialog::~RunDialog()
     SolarMutexGuard g;
 
     if (mpCreatedParent)
-    {
         gdk_window_destroy (mpCreatedParent);
-    }
+
+    g_source_remove_by_user_data (this);
 }
 
 void SAL_CALL RunDialog::windowOpened( const ::com::sun::star::lang::EventObject& )
-- 
cgit