Bug #300655 --> more changes to move gnome integration to shell

mail/components/build/Makefile.in

@@ -76,7 +76,7 @@ SHARED_LIBRARY_LIBS = \
 	$(NULL)
 
 ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2)
-SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)mail_gnome_s.$(LIB_SUFFIX)
+SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)shellservice_s.$(LIB_SUFFIX)
 endif
 
 EXTRA_DSO_LDOPTS += \

mail/components/shell/Makefile.in

@@ -42,9 +42,9 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE = mail_gnome
-LIBRARY_NAME = mail_gnome_s
-MODULE_NAME = nsMailGNOMEModule
+MODULE = shellservice
+LIBRARY_NAME = shellservice_s
+MODULE_NAME = nsMailShellModule
 MOZILLA_INTERNAL_API = 1
 
 REQUIRES = \
@@ -60,7 +60,9 @@ REQUIRES = \
 	embed_base \
 	$(NULL)
 
+ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2)
 CPPSRCS = nsMailGNOMEIntegration.cpp
+endif
 
 FORCE_STATIC_LIB = 1