sfx2/source/appl/shutdowniconunx.cxx | 4 ++-- vcl/inc/unx/gtk/gtkdata.hxx | 2 +- vcl/unx/gtk/gtksalframe.cxx | 2 +- vcl/unx/gtk3/gtk3gtkdata.cxx | 6 ++---- vcl/unx/gtk3/gtk3gtkframe.cxx | 2 +- 5 files changed, 7 insertions(+), 9 deletions(-)
New commits: commit 8980196fb65a7cb3d0f1f635bfc7645eb3982b81 Author: Caolán McNamara <caol...@redhat.com> Date: Mon Feb 29 14:58:39 2016 +0000 libreoffice-main -> libreoffice-startcenter to sync these names with the the .desktop names Change-Id: I1c4d8943e61b5ae537b865d5a9c3065894f200d7 diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx index f8c84d4..998b585 100644 --- a/sfx2/source/appl/shutdowniconunx.cxx +++ b/sfx2/source/appl/shutdowniconunx.cxx @@ -141,7 +141,7 @@ static void add_item( GtkMenuShell *pMenuShell, const char *pAsciiURL, else if (nResId == SV_ICON_ID_FORMULA) appicon = g_strdup ("libreoffice-math"); else - appicon = g_strdup ("libreoffice-main"); + appicon = g_strdup ("libreoffice-startcenter"); GtkWidget *pImage = gtk_image_new_from_icon_name (appicon, GTK_ICON_SIZE_MENU); GtkWidget *pMenuItem = gtk_image_menu_item_new_with_label( aLabel.getStr() ); @@ -340,7 +340,7 @@ void plugin_init_sys_tray() pVCLResMgr = ResMgr::CreateResMgr("vcl"); - pTrayIcon = gtk_status_icon_new_from_icon_name ("libreoffice-main"); + pTrayIcon = gtk_status_icon_new_from_icon_name ("libreoffice-startcenter"); g_object_set (pTrayIcon, "title", aLabel.getStr(), "tooltip_text", aLabel.getStr(), nullptr); diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx index 3e9d51a..8654695 100644 --- a/vcl/unx/gtk/gtksalframe.cxx +++ b/vcl/unx/gtk/gtksalframe.cxx @@ -1472,7 +1472,7 @@ void GtkSalFrame::SetIcon( sal_uInt16 nIcon ) else if (nIcon == SV_ICON_ID_FORMULA) appicon = g_strdup ("libreoffice-math"); else - appicon = g_strdup ("libreoffice-main"); + appicon = g_strdup ("libreoffice-startcenter"); gtk_window_set_icon_name (GTK_WINDOW (m_pWindow), appicon); } diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index d340c50..99d3676 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -1376,7 +1376,7 @@ void GtkSalFrame::SetIcon( sal_uInt16 nIcon ) else if (nIcon == SV_ICON_ID_FORMULA) appicon = g_strdup ("libreoffice-math"); else - appicon = g_strdup ("libreoffice-main"); + appicon = g_strdup ("libreoffice-startcenter"); gtk_window_set_icon_name (GTK_WINDOW (m_pWindow), appicon); g_free (appicon); commit e82d011ede2b7cb9bb53d463c3f0f397a0dd57fd Author: Caolán McNamara <caol...@redhat.com> Date: Mon Feb 29 10:48:29 2016 +0000 gtk3: presumably XrmInitialize can be dropped now Change-Id: Ib3e87d8a07f4e38f8dcb6e1226f91920df53c81c diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx index a3d85a1..037d213 100644 --- a/vcl/inc/unx/gtk/gtkdata.hxx +++ b/vcl/inc/unx/gtk/gtkdata.hxx @@ -97,7 +97,7 @@ public: class GtkData : public SalGenericData { - GSource * m_pUserEvent; + GSource* m_pUserEvent; osl::Mutex m_aDispatchMutex; oslCondition m_aDispatchCondition; bool blockIdleTimeout; diff --git a/vcl/unx/gtk3/gtk3gtkdata.cxx b/vcl/unx/gtk3/gtk3gtkdata.cxx index 75a476e..27cf00e 100644 --- a/vcl/unx/gtk3/gtk3gtkdata.cxx +++ b/vcl/unx/gtk3/gtk3gtkdata.cxx @@ -494,9 +494,7 @@ SalYieldResult GtkData::Yield( bool bWait, bool bHandleAllCurrentEvents ) void GtkData::Init() { - int i; SAL_INFO( "vcl.gtk", "GtkMainloop::Init()" ); - XrmInitialize(); /* * open connection to X11 Display @@ -517,7 +515,7 @@ void GtkData::Init() osl_getExecutableFile( &aParam.pData ); osl_getSystemPathFromFileURL( aParam.pData, &aBin.pData ); pCmdLineAry[0] = g_strdup( OUStringToOString( aBin, aEnc ).getStr() ); - for (i=0; i<nParams; i++) + for (int i = 0; i < nParams; ++i) { osl_getCommandArg(i, &aParam.pData ); OString aBParam( OUStringToOString( aParam, aEnc ) ); @@ -548,7 +546,7 @@ void GtkData::Init() gtk_init_check( &nParams, &pCmdLineAry ); gdk_error_trap_push(); - for (i = 0; i < nParams; i++ ) + for (int i = 0; i < nParams; ++i) g_free( pCmdLineAry[i] ); delete [] pCmdLineAry;
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits