diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-10-01 06:22:04 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-11-14 13:52:52 +0100 |
| commit | 920dc60a8c019ed464634fec1657fedb167ff373 (patch) | |
| tree | ed678de327ba7e02a8a2a1c2e0de85504bdea3ef /vcl/inc/unx | |
| parent | 17a2807b3662f91a17a924473972802cf225ecaf (diff) | |
tweak menu destruction
Diffstat (limited to 'vcl/inc/unx')
| -rw-r--r-- | vcl/inc/unx/gtk/gtkframe.hxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index 1f8f4a3ca208..125c074fbd62 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -54,8 +54,6 @@ typedef XLIB_Window GdkNativeWindow; #define gdk_window_foreign_new_for_display(a,b) gdk_x11_window_foreign_new_for_display(a,b) #endif -static sal_Bool bDBusIsAvailable = sal_False; - class GtkSalFrame : public SalFrame { static const int nMaxGraphics = 2; @@ -215,7 +213,12 @@ class GtkSalFrame : public SalFrame #endif SalMenu* m_pSalMenu; - sal_uInt32 m_nWatcherId; + friend void ensure_dbus_setup(GdkWindow* gdkWindow, GtkSalFrame* pSalFrame); + friend void on_registrar_available (GDBusConnection*, const gchar*, const gchar*, gpointer); + friend void on_registrar_unavailable (GDBusConnection*, const gchar*, gpointer); + guint m_nWatcherId; + guint m_nMenuExportId; + guint m_nActionGroupExportId; void Init( SalFrame* pParent, sal_uLong nStyle ); void Init( SystemParentData* pSysData ); |