From 5902e8c5da2deee6d1c4131ab1b86faecf07dbcb Mon Sep 17 00:00:00 2001 From: "caillon%redhat.com" Date: Mon, 7 Mar 2005 22:40:36 +0000 Subject: [PATCH] Bug 281979 Call g_set_application_name () to give the window manager a hint as to what name to use when grouping windows. r=bsmedberg Relanding with initialization of local PRLibrary to nsnull. git-svn-id: svn://10.0.0.236/trunk@170328 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/toolkit/xre/nsAppRunner.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/mozilla/toolkit/xre/nsAppRunner.cpp b/mozilla/toolkit/xre/nsAppRunner.cpp index b245f346e64..d7611f7de66 100644 --- a/mozilla/toolkit/xre/nsAppRunner.cpp +++ b/mozilla/toolkit/xre/nsAppRunner.cpp @@ -1456,6 +1456,11 @@ public: }; #endif +#ifdef MOZ_WIDGET_GTK2 +#include "prlink.h" +typedef void (*_g_set_application_name_fn)(const gchar *application_name); +#endif + int xre_main(int argc, char* argv[], const nsXREAppData* aAppData) { nsresult rv; @@ -1591,6 +1596,19 @@ int xre_main(int argc, char* argv[], const nsXREAppData* aAppData) #endif gtk_init(&gArgc, &gArgv); +#if defined(MOZ_WIDGET_GTK2) + // g_set_application_name () is only defined in glib2.2 and higher. + PRLibrary *glib2 = nsnull; + _g_set_application_name_fn _g_set_application_name = + (_g_set_application_name_fn)PR_FindFunctionSymbolAndLibrary("g_set_application_name", &glib2); + if (_g_set_application_name) { + _g_set_application_name(gAppData->appName); + } + if (glib2) { + PR_UnloadLibrary(glib2); + } +#endif + gtk_widget_set_default_visual(gdk_rgb_get_visual()); gtk_widget_set_default_colormap(gdk_rgb_get_cmap()); #endif /* MOZ_WIDGET_GTK || MOZ_WIDGET_GTK2 */