Annotation of /trunk/mozilla-firefox/patches/mozilla-firefox-1.0.7-g-application-name.patch
Parent Directory | Revision Log
Revision 153 -
(hide annotations)
(download)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 1344 byte(s)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 1344 byte(s)
-import
1 | niro | 153 | Index: xpfe/bootstrap/nsAppRunner.cpp |
2 | =================================================================== | ||
3 | RCS file: /cvsroot/mozilla/xpfe/bootstrap/nsAppRunner.cpp,v | ||
4 | retrieving revision 1.428 | ||
5 | diff -d -u -p -r1.428 nsAppRunner.cpp | ||
6 | --- xpfe/bootstrap/nsAppRunner.cpp 20 Dec 2004 21:53:33 -0000 1.428 | ||
7 | +++ xpfe/bootstrap/nsAppRunner.cpp 5 Mar 2005 08:39:12 -0000 | ||
8 | @@ -1612,6 +1612,11 @@ static PRBool GetWantSplashScreen(int ar | ||
9 | return dosplash; | ||
10 | } | ||
11 | |||
12 | +#ifdef MOZ_WIDGET_GTK2 | ||
13 | +#include "prlink.h" | ||
14 | +typedef void (*_g_set_application_name_fn)(const gchar *application_name); | ||
15 | +#endif | ||
16 | + | ||
17 | int main(int argc, char* argv[]) | ||
18 | { | ||
19 | NS_TIMELINE_MARK("enter main"); | ||
20 | @@ -1712,6 +1717,19 @@ int main(int argc, char* argv[]) | ||
21 | #endif | ||
22 | gtk_init(&argc, &argv); | ||
23 | |||
24 | +#if defined(MOZ_WIDGET_GTK2) | ||
25 | + // g_set_application_name () is only defined in glib2.2 and higher. | ||
26 | + PRLibrary *glib2; | ||
27 | + _g_set_application_name_fn _g_set_application_name = | ||
28 | + (_g_set_application_name_fn)PR_FindFunctionSymbolAndLibrary("g_set_application_name", &glib2); | ||
29 | + if (_g_set_application_name) { | ||
30 | + _g_set_application_name("Mozilla"); /* MOZ_APP_NAME */ | ||
31 | + } | ||
32 | + if (glib2) { | ||
33 | + PR_UnloadLibrary(glib2); | ||
34 | + } | ||
35 | +#endif | ||
36 | + | ||
37 | gtk_widget_set_default_visual(gdk_rgb_get_visual()); | ||
38 | gtk_widget_set_default_colormap(gdk_rgb_get_cmap()); | ||
39 | #endif /* MOZ_WIDGET_GTK || MOZ_WIDGET_GTK2 */ |