diff --git a/cmd/xfe/src/Splash.cpp b/cmd/xfe/src/Splash.cpp index 6d1e8b0638b..a3783b613dd 100644 --- a/cmd/xfe/src/Splash.cpp +++ b/cmd/xfe/src/Splash.cpp @@ -105,7 +105,7 @@ XFE_Splash::XFE_Splash(Widget toplevel) fe_InitColormap (m_context); - PREF_AlterSplashIcon(&Splash); + //PREF_AlterSplashIcon(&Splash); fe_NewMakeIcon(m_shell, BlackPixelOfScreen(XtScreen(m_shell)), //XXX hack... doesn't really matter though. diff --git a/modules/libpref/public/prefapi.h b/modules/libpref/public/prefapi.h index 63d6c6506e7..fa8f24d0be4 100644 --- a/modules/libpref/public/prefapi.h +++ b/modules/libpref/public/prefapi.h @@ -382,10 +382,8 @@ PR_EXTERN(int) PREF_UnregisterCallback( const char* domain, PR_EXTERN(XP_Bool) PREF_IsAutoAdminEnabled(); #ifdef XP_UNIX -struct fe_icon_data; typedef void* XmStringPtr; typedef void* KeySymPtr; -PR_EXTERN(void) PREF_AlterSplashIcon(struct fe_icon_data*); PR_EXTERN(XP_Bool) PREF_GetLabelAndMnemonic(char*, char**, XmStringPtr xmstring, KeySymPtr keysym); PR_EXTERN(XP_Bool) PREF_GetUrl(char*, char**); #endif diff --git a/modules/libpref/src/Makefile b/modules/libpref/src/Makefile index faa371b0023..1ba0d2727a0 100644 --- a/modules/libpref/src/Makefile +++ b/modules/libpref/src/Makefile @@ -104,7 +104,7 @@ DEFINES += -DNSPR20 VPATH += init/ unix/ # this comes after rules.mk because rules.mk blows it away -INCLUDES += -I$(DEPTH)/cmd/xfe/icons -Iunix +INCLUDES += -Iunix $(LIBRARY): $(OBJS) diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in index 73d7e4b194d..5dde6fd531d 100644 --- a/modules/libpref/src/Makefile.in +++ b/modules/libpref/src/Makefile.in @@ -108,7 +108,7 @@ include $(topsrcdir)/config/rules.mk VPATH += $(srcdir)/init $(srcdir)/unix # this comes after rules.mk because rules.mk blows it away -INCLUDES += -I$(topsrcdir)/cmd/xfe/icons -I$(srcdir)/unix -I./unix +INCLUDES += -I$(srcdir)/unix -I./unix $(LIBRARY): $(OBJS) diff --git a/modules/libpref/src/unix/unixpref.c b/modules/libpref/src/unix/unixpref.c index ad364a250c4..8cde1ca1301 100644 --- a/modules/libpref/src/unix/unixpref.c +++ b/modules/libpref/src/unix/unixpref.c @@ -27,13 +27,6 @@ #include "xpassert.h" #include "fe_proto.h" -extern PRLibrary* pref_LoadAutoAdminLib(void); -extern PRLibrary* m_AutoAdminLib; - -#include "icondata.h" - -static struct fe_icon_type* splash_screen = NULL; - /* * pref_InitInitialObjects @@ -71,27 +64,6 @@ pref_InitInitialObjects(void) } -/* - * PREF_AlterSplashIcon - */ -void -PREF_AlterSplashIcon(struct fe_icon_data* icon) -{ - assert(icon); - - if ( PREF_IsAutoAdminEnabled() && - icon && - (splash_screen = (struct fe_icon_type*) -#ifndef NSPR20 - PR_FindSymbol("_POLARIS_SplashPro", m_AutoAdminLib)) != NULL ) { -#else - PR_FindSymbol(m_AutoAdminLib, "_POLARIS_SplashPro")) != NULL ) { -#endif - - memcpy(icon, splash_screen, sizeof(*icon)); - } -} - /* * PREF_GetLabelAndMnemonic */