Bug 546487 - Remove 1.9.2 ifdefs from suite/ on comm-central; (Av1) The non-installer part.
authorSerge Gautherie <sgautherie.bz@free.fr>
Sat, 20 Feb 2010 01:03:06 +0100
changeset 4968 6eca7164d6b0d44b2821f0ea61a1edf9c268eae4
parent 4967 c63d9bfe9adfb08630e951328fe3187fd68087a2
child 4969 c9a7a0a121754432d68218356971e7b6563d1a04
push idunknown
push userunknown
push dateunknown
bugs546487
Bug 546487 - Remove 1.9.2 ifdefs from suite/ on comm-central; (Av1) The non-installer part. r+sr=neil.
suite/app/Makefile.in
suite/shell/src/nsWindowsShellService.cpp
suite/themes/modern/global/appPicker.css
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -166,29 +166,25 @@ EXTRA_DEPS	+= \
 	$(NULL)
 DEFINES		+= $(STATIC_DEFINES)
 CPPSRCS		+= $(STATIC_CPPSRCS)
 EXTRA_DSO_LIBS	+= $(STATIC_EXTRA_DSO_LIBS)
 REQUIRES	+= $(STATIC_REQUIRES)
 EXTRA_LIBS	+= $(STATIC_EXTRA_LIBS)
 endif
 
-ifndef MOZILLA_1_9_2_BRANCH
-
 # OpenGL is required for MOZ_ENABLE_CANVAS3D (only set in m-c build system).
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 OS_LIBS += -framework OpenGL
 endif
 
 ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
 OS_LIBS += opengl32.lib
 endif
 
-endif # MOZILLA_1_9_2_BRANCH
-
 ifeq ($(OS_ARCH),WINNT)
 OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool)
 RCINCLUDE = splash.rc
 ifndef GNU_CC
 RCFLAGS += -DMOZ_SUITE -I$(srcdir)
 else
 RCFLAGS += -DMOZ_SUITE --include-dir $(srcdir)
 endif
--- a/suite/shell/src/nsWindowsShellService.cpp
+++ b/suite/shell/src/nsWindowsShellService.cpp
@@ -574,23 +574,19 @@ nsWindowsShellService::SetShouldBeDefaul
   NS_ENSURE_SUCCESS(rv, rv);
   return prefs->SetIntPref("shell.checkDefaultApps", aApps);
 }
 
 static nsresult
 WriteBitmap(nsIFile* aFile, imgIContainer* aImage)
 {
   nsRefPtr<gfxImageSurface> image;
-#ifdef MOZILLA_1_9_2_BRANCH
-  nsresult rv = aImage->CopyCurrentFrame(getter_AddRefs(image));
-#else
   nsresult rv = aImage->CopyFrame(imgIContainer::FRAME_CURRENT,
                                   imgIContainer::FLAG_SYNC_DECODE,
                                   getter_AddRefs(image));
-#endif
   NS_ENSURE_SUCCESS(rv, rv);
 
   PRInt32 width = image->Width();
   PRInt32 height = image->Height();
 
   PRUint8* bits = image->Data();
   PRUint32 length = image->GetDataSize();
   PRUint32 bpr = PRUint32(image->Stride());
--- a/suite/themes/modern/global/appPicker.css
+++ b/suite/themes/modern/global/appPicker.css
@@ -1,37 +1,16 @@
 #app-picker {
   width: 57ch;
 }
 
 #content-description {
   font-weight: bold;
 }
 
-/*
- * MOZILLA_1_9_2_BRANCH
- * The following styles apply to the toolkit 1.9.2 version of the App Picker.
- * These should be removed once the comm-1.9.2 branch is created.
- */
-
-#app-picker-list {
-  height: 224px;
-}
-
-#app-picker-item {
-  border-bottom: 1px dotted #C7D0D9;
-}
-
-#app-picker-item-image,
-#app-picker-item-cell {
-  padding: 5px;
-}
-
-/* End of 1.9.2 styles */
-
 .listitem-iconic {
   border-bottom: 1px dotted #C7D0D9;
 }
 
 #content-icon,
 .listcell-icon {
   margin: 5px;
   width: 32px;