From 672d06e7f172da3fdcdafb1411d42092ef9f2087 Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Tue, 20 May 2003 10:47:30 +0000 Subject: Fix some warnings. Go back hardcoding defaults in the code, mozilla pref 2003-05-20 Marco Pesenti Gritti * embed/downloader-view.c: (downloader_view_build_ui): * embed/mozilla/Makefile.am: * embed/mozilla/default-prefs.js: * embed/mozilla/mozilla-embed-single.cpp: * embed/mozilla/mozilla-notifiers.cpp: * embed/mozilla/mozilla-prefs.cpp: * embed/mozilla/mozilla-prefs.h: * lib/ephy-dnd.c: (ephy_dnd_node_list_extract_nodes): * src/bookmarks/ephy-bookmarks-editor.c: (ephy_bookmarks_editor_construct): * src/ephy-history-window.c: (ephy_history_window_construct): Fix some warnings. Go back hardcoding defaults in the code, mozilla pref api sucks :/ Cleanup mozilla prefs code, we can use mozilla api directly now, no need for a wrapper like in galeon1. --- embed/mozilla/mozilla-prefs.cpp | 200 ---------------------------------------- 1 file changed, 200 deletions(-) delete mode 100644 embed/mozilla/mozilla-prefs.cpp (limited to 'embed/mozilla/mozilla-prefs.cpp') diff --git a/embed/mozilla/mozilla-prefs.cpp b/embed/mozilla/mozilla-prefs.cpp deleted file mode 100644 index 55f9dcc6b..000000000 --- a/embed/mozilla/mozilla-prefs.cpp +++ /dev/null @@ -1,200 +0,0 @@ -/* - * Copyright (C) 2000-2002 Marco Pesenti Gritti - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#include "mozilla-prefs.h" - -#include -#include -#include -#include -#include -#include -#include -#include - -void -mozilla_prefs_load (const char *filename) -{ - nsresult rv; - - nsCOMPtr prefsLocalFile; - rv = NS_NewLocalFile (NS_ConvertUTF8toUCS2(filename), PR_TRUE, getter_AddRefs (prefsLocalFile)); - g_return_if_fail (NS_SUCCEEDED(rv)); - - nsCOMPtr prefService = - do_GetService (NS_PREFSERVICE_CONTRACTID); - g_return_if_fail (prefService != nsnull); - - nsCOMPtr prefsFile; - prefsLocalFile->QueryInterface(NS_GET_IID(nsIFile), (void **)&prefsFile); - g_return_if_fail (prefsFile != nsnull); - - prefService->ReadUserPrefs (prefsFile); -} - -gboolean -mozilla_prefs_save (const char *filename) -{ - nsresult rv; - - nsCOMPtr prefsLocalFile; - rv = NS_NewLocalFile (NS_ConvertUTF8toUCS2(filename), PR_TRUE, getter_AddRefs (prefsLocalFile)); - g_return_val_if_fail (NS_SUCCEEDED(rv), FALSE); - - nsCOMPtr prefService = - do_GetService (NS_PREFSERVICE_CONTRACTID); - g_return_val_if_fail (prefService != nsnull, FALSE); - - nsCOMPtr prefsFile; - prefsLocalFile->QueryInterface(NS_GET_IID(nsIFile), (void **)&prefsFile); - g_return_val_if_fail (prefsFile != nsnull, FALSE); - - rv = prefService->SavePrefFile (prefsFile); - - return NS_SUCCEEDED (rv) ? TRUE : FALSE; -} - -gboolean -mozilla_prefs_set_string(const char *preference_name, const char *new_value) -{ - g_return_val_if_fail (preference_name != NULL, FALSE); - g_return_val_if_fail (new_value != NULL, FALSE); - nsCOMPtr prefService = - do_GetService (NS_PREFSERVICE_CONTRACTID); - nsCOMPtr pref; - prefService->GetBranch ("", getter_AddRefs(pref)); - - if (pref) - { - nsresult rv = pref->SetCharPref (preference_name, new_value); - return NS_SUCCEEDED (rv) ? TRUE : FALSE; - } - - return FALSE; -} - -gboolean -mozilla_prefs_set_boolean (const char *preference_name, - gboolean new_boolean_value) -{ - g_return_val_if_fail (preference_name != NULL, FALSE); - - nsCOMPtr prefService = - do_GetService (NS_PREFSERVICE_CONTRACTID); - nsCOMPtr pref; - prefService->GetBranch ("", getter_AddRefs(pref)); - - if (pref) - { - nsresult rv = pref->SetBoolPref (preference_name, - new_boolean_value ? PR_TRUE : PR_FALSE); - return NS_SUCCEEDED (rv) ? TRUE : FALSE; - } - return FALSE; -} - -gboolean -mozilla_prefs_set_int (const char *preference_name, int new_int_value) -{ - g_return_val_if_fail (preference_name != NULL, FALSE); - - nsCOMPtr prefService = - do_GetService (NS_PREFSERVICE_CONTRACTID); - nsCOMPtr pref; - prefService->GetBranch ("", getter_AddRefs(pref)); - - if (pref) - { - nsresult rv = pref->SetIntPref (preference_name, new_int_value); - return NS_SUCCEEDED (rv) ? TRUE : FALSE; - } - - return FALSE; -} - -gboolean -mozilla_prefs_get_boolean (const char *preference_name, - gboolean default_value) -{ - PRBool value; - - g_return_val_if_fail (preference_name != NULL, FALSE); - - nsCOMPtr prefService = - do_GetService (NS_PREFSERVICE_CONTRACTID); - nsCOMPtr pref; - prefService->GetBranch ("", getter_AddRefs(pref)); - - if (pref) - { - nsresult result; - - result = pref->GetBoolPref (preference_name, &value); - if (NS_FAILED (result)) return default_value; - } - - return (value == PR_TRUE) ? TRUE : FALSE; -} - -gint -mozilla_prefs_get_int (const char *preference_name) -{ - int value = -1; - - g_return_val_if_fail (preference_name != NULL, FALSE); - - nsCOMPtr prefService = - do_GetService (NS_PREFSERVICE_CONTRACTID); - nsCOMPtr pref; - prefService->GetBranch ("", getter_AddRefs(pref)); - - if (pref) - { - pref->GetIntPref (preference_name, &value); - } - - return value; -} - -gchar * -mozilla_prefs_get_string(const char *preference_name) -{ - gchar *value = NULL; - gchar *result = NULL; - - g_return_val_if_fail (preference_name != NULL, FALSE); - nsCOMPtr prefService = - do_GetService (NS_PREFSERVICE_CONTRACTID); - nsCOMPtr pref; - prefService->GetBranch ("", getter_AddRefs(pref)); - - if (pref) - { - pref->GetCharPref (preference_name, &value); - } - - /* it's allocated by mozilla, so I could not g_free it */ - if (value) - { - result = g_strdup (value); - nsMemory::Free (value); - } - - return result; -} - -- cgit v1.2.3