Bug 1155943 - Drop checks for the presence of glib2.2 and gtk2.2 functions since they are already deps anyway. r=karlt

--HG--
extra : rebase_source : aae2620509a3d2a780a041c6b58f50ec7fc75608
This commit is contained in:
Bryan Quigley 2015-04-20 07:11:00 -04:00
Родитель 64d710a064
Коммит 7859f17e44
1 изменённых файлов: 2 добавлений и 26 удалений

Просмотреть файл

@ -2728,21 +2728,6 @@ static void MakeOrSetMinidumpPath(nsIFile* profD)
const nsXREAppData* gAppData = nullptr;
#ifdef MOZ_WIDGET_GTK
#include "prlink.h"
typedef void (*_g_set_application_name_fn)(const gchar *application_name);
typedef void (*_gtk_window_set_auto_startup_notification_fn)(gboolean setting);
static PRFuncPtr FindFunction(const char* aName)
{
PRLibrary *lib = nullptr;
PRFuncPtr result = PR_FindFunctionSymbolAndLibrary(aName, &lib);
// Since the library was already loaded, we can safely unload it here.
if (lib) {
PR_UnloadLibrary(lib);
}
return result;
}
static void MOZ_gdk_display_close(GdkDisplay *display)
{
#if CLEANUP_MEMORY
@ -3656,17 +3641,8 @@ XREMain::XRE_mainStartup(bool* aExitFlag)
}
#endif
#if defined(MOZ_WIDGET_GTK)
// g_set_application_name () is only defined in glib2.2 and higher.
_g_set_application_name_fn _g_set_application_name =
(_g_set_application_name_fn)FindFunction("g_set_application_name");
if (_g_set_application_name) {
_g_set_application_name(mAppData->name);
}
_gtk_window_set_auto_startup_notification_fn _gtk_window_set_auto_startup_notification =
(_gtk_window_set_auto_startup_notification_fn)FindFunction("gtk_window_set_auto_startup_notification");
if (_gtk_window_set_auto_startup_notification) {
_gtk_window_set_auto_startup_notification(false);
}
g_set_application_name(mAppData->name);
gtk_window_set_auto_startup_notification(false);
#if (MOZ_WIDGET_GTK == 2)
gtk_widget_set_default_colormap(gdk_rgb_get_colormap());