diff options
| author | Tomaž Vajngerl <quikee@gmail.com> | 2013-10-26 19:01:41 +0200 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2013-10-26 19:04:38 +0200 |
| commit | 2e99447fc07df98ebbc343ef79852b7eaf7b7757 (patch) | |
| tree | 3a7214866f1c4e2e85b82f9dae6050569f9bc0ab /vcl | |
| parent | 7d32da410cb413f540f2127db4e6dc2807506510 (diff) | |
fix warnings in gtksalframe
g_simple_action_group_add_entries was deprecated in GLib 2.38
Change-Id: I727e8aeeecd66b8f071d43ff56d9dc94cda1b9e0
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/gtk/window/gtksalframe.cxx | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx index a3e3b91dc6fc..58d402c1b726 100644 --- a/vcl/unx/gtk/window/gtksalframe.cxx +++ b/vcl/unx/gtk/window/gtksalframe.cxx @@ -394,7 +394,7 @@ void GtkSalFrame::doKeyCallback( guint state, { SalKeyEvent aEvent; - aEvent.mnTime = time; + aEvent.mnTime = time; aEvent.mnCharCode = aOrigCode; aEvent.mnRepeat = 0; @@ -722,7 +722,11 @@ gboolean ensure_dbus_setup( gpointer data ) g_object_unref(thirdsubmenu); GSimpleActionGroup *group = g_simple_action_group_new (); +#if GLIB_CHECK_VERSION(2,38,0) // g_simple_action_group_add_entries is deprecated since 2.38 + g_action_map_add_action_entries (G_ACTION_MAP (group), app_entries, G_N_ELEMENTS (app_entries), NULL); +#else g_simple_action_group_add_entries (group, app_entries, G_N_ELEMENTS (app_entries), NULL); +#endif GActionGroup* pAppActionGroup = G_ACTION_GROUP(group); pSalFrame->m_nAppActionGroupExportId = g_dbus_connection_export_action_group( pSessionBus, "/org/libreoffice", pAppActionGroup, NULL); @@ -1021,9 +1025,9 @@ void GtkSalFrame::InitCommon() #if !GTK_CHECK_VERSION(3,0,0) GtkSalDisplay* pDisp = GetGtkSalData()->GetGtkDisplay(); m_aSystemData.pDisplay = pDisp->GetDisplay(); - m_aSystemData.pVisual = pDisp->GetVisual( m_nXScreen ).GetVisual(); - m_aSystemData.nDepth = pDisp->GetVisual( m_nXScreen ).GetDepth(); - m_aSystemData.aColormap = pDisp->GetColormap( m_nXScreen ).GetXColormap(); + m_aSystemData.pVisual = pDisp->GetVisual( m_nXScreen ).GetVisual(); + m_aSystemData.nDepth = pDisp->GetVisual( m_nXScreen ).GetDepth(); + m_aSystemData.aColormap = pDisp->GetColormap( m_nXScreen ).GetXColormap(); m_aSystemData.aWindow = widget_get_xid(m_pWindow); #else static int nWindow = 0; @@ -3575,7 +3579,8 @@ gboolean GtkSalFrame::signalMap( GtkWidget *pWidget, GdkEvent*, gpointer frame ) { sFinalProgram += "--display " + sDisplay; } - system(sFinalProgram.getStr()); + int returnValue = system(sFinalProgram.getStr()); + (void)returnValue; } } } |