--- bluegorilla.old/suite/shell/src/nsGNOMEShellService.cpp
+++ bluegorilla/suite/shell/src/nsGNOMEShellService.cpp
@@ -10,7 +10,6 @@
 #include "nsGNOMEShellService.h"
 #include "nsServiceManagerUtils.h"
 #include "nsIGSettingsService.h"
-#include "nsIGConfService.h"
 #include "nsIGIOService.h"
 #include "nsIPrefService.h"
 #include "nsIStringBundle.h"
@@ -168,7 +167,6 @@
   nsCString handler;
   nsCOMPtr<nsIGIOMimeApp> app;
   nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
-  nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
 
   for (unsigned i = 0; i < mozilla::ArrayLength(gProtocols); i++) {
     if (aApps & gProtocols[i].app) {
@@ -182,12 +180,6 @@
             !HandlerMatchesAppName(handler.get()))
          return NS_OK;
       }
-
-      bool enabled;
-      if (gconf &&
-          NS_SUCCEEDED(gconf->GetAppForProtocol(protocol, &enabled, handler)) &&
-          (!enabled || !HandlerMatchesAppName(handler.get())))
-        return NS_OK;
     }
   }
 
@@ -221,19 +213,6 @@
     }
   }
 
-  nsCString appKeyValue;
-  nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
-  if (gconf) {
-    if (!mAppIsInPath)
-      appKeyValue = mAppPath;
-    else {
-      gchar* basename = g_path_get_basename(mAppPath.get());
-      appKeyValue = basename;
-      g_free(basename);
-    }
-    appKeyValue.AppendLiteral(" %s");
-  }
-
   for (unsigned i = 0; i < mozilla::ArrayLength(gProtocols); i++) {
     if (aApps & gProtocols[i].app) {
       nsDependentCString protocol(gProtocols[i].protocol);
@@ -241,10 +220,6 @@
         rv = app->SetAsDefaultForURIScheme(protocol);
         NS_ENSURE_SUCCESS(rv, rv);
       }
-      if (gconf) {
-        rv = gconf->SetAppForProtocol(protocol, appKeyValue);
-        NS_ENSURE_SUCCESS(rv, rv);
-      }
     }
   }
 
@@ -298,8 +273,7 @@
 NS_IMETHODIMP
 nsGNOMEShellService::GetCanSetDesktopBackground(bool* aResult)
 {
-  nsCOMPtr<nsIGConfService> gconf(do_GetService(NS_GCONFSERVICE_CONTRACTID));
-  *aResult = gconf && getenv("GNOME_DESKTOP_SESSION_ID");
+  *aResult = 0;
   return NS_OK;
 }
 
@@ -389,20 +363,6 @@
     }
   }
 
-  // if the file was written successfully, set it as the system wallpaper
-  nsCOMPtr<nsIGConfService> gconf(do_GetService(NS_GCONFSERVICE_CONTRACTID));
-
-  if (gconf) {
-    gconf->SetString(NS_LITERAL_CSTRING(DGB_OPTIONS), nsDependentCString(options));
-
-    // Set the image to an empty string first to force a refresh (since we could
-    // be writing a new image on top of an existing SeaMonkey_wallpaper.png
-    // and nautilus doesn't monitor the file for changes).
-    gconf->SetString(NS_LITERAL_CSTRING(DGB_IMAGE), EmptyCString());
-    gconf->SetString(NS_LITERAL_CSTRING(DGB_IMAGE), filePath);
-    gconf->SetBool(NS_LITERAL_CSTRING(DGB_DRAWBG), true);
-  }
-
   return NS_OK;
 }
 
@@ -422,11 +382,6 @@
   if (background_settings)
     background_settings->GetString(NS_LITERAL_CSTRING(OGDB_COLOR),
                                    background);
-  else {
-    nsCOMPtr<nsIGConfService> gconf(do_GetService(NS_GCONFSERVICE_CONTRACTID));
-    if (gconf)
-      gconf->GetString(NS_LITERAL_CSTRING(DGB_COLOR), background);
-  }
 
   if (background.IsEmpty())
     return NS_ERROR_FAILURE;
@@ -466,10 +421,6 @@
     }
   }
 
-  nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
-  if (gconf)
-    gconf->SetString(NS_LITERAL_CSTRING(DGB_COLOR), nsDependentCString(colorString));
-
   return NS_OK;
 }