diff options
author | Christian Persch <chpe@cvs.gnome.org> | 2006-05-16 02:32:49 +0800 |
---|---|---|
committer | Christian Persch <chpe@src.gnome.org> | 2006-05-16 02:32:49 +0800 |
commit | 2d7092794b6036b1c2a40ae83f468bc4434b3b6d (patch) | |
tree | 9a246e4a7ea564611fcccad14e87b2d110929c78 | |
parent | 5294b2824f5574d1d10ec23a6d72c386a1616fc3 (diff) | |
download | gsoc2013-epiphany-2d7092794b6036b1c2a40ae83f468bc4434b3b6d.tar gsoc2013-epiphany-2d7092794b6036b1c2a40ae83f468bc4434b3b6d.tar.gz gsoc2013-epiphany-2d7092794b6036b1c2a40ae83f468bc4434b3b6d.tar.bz2 gsoc2013-epiphany-2d7092794b6036b1c2a40ae83f468bc4434b3b6d.tar.lz gsoc2013-epiphany-2d7092794b6036b1c2a40ae83f468bc4434b3b6d.tar.xz gsoc2013-epiphany-2d7092794b6036b1c2a40ae83f468bc4434b3b6d.tar.zst gsoc2013-epiphany-2d7092794b6036b1c2a40ae83f468bc4434b3b6d.zip |
=== Release 2.14.1.1 ===RELEASE_2_14_1_1
2006-05-15 Christian Persch <chpe@cvs.gnome.org>
=== Release 2.14.1.1 ===
* NEWS:
* configure.ac:
2006-05-15 Christian Persch <chpe@cvs.gnome.org>
* embed/mozilla/EphyHeaderSniffer.cpp:
* embed/mozilla/EphyUtils.cpp:
* embed/mozilla/FilePicker.cpp:
* embed/mozilla/GtkNSSClientAuthDialogs.cpp:
* embed/mozilla/GtkNSSDialogs.cpp:
* embed/mozilla/GtkNSSKeyPairDialogs.cpp:
* embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:
* embed/mozilla/MozDownload.cpp:
* embed/mozilla/mozilla-embed-persist.cpp:
* embed/mozilla/mozilla-embed-single.cpp:
* embed/mozilla/mozilla-notifiers.cpp:
* embed/mozilla/mozilla-x509-cert.cpp:
Some castings.
-rw-r--r-- | ChangeLog | 24 | ||||
-rw-r--r-- | NEWS | 37 | ||||
-rw-r--r-- | configure.ac | 6 | ||||
-rw-r--r-- | doc/reference/tmpl/EphySingle.sgml | 2 | ||||
-rw-r--r-- | doc/reference/tmpl/ephy-embed-factory.sgml | 2 | ||||
-rw-r--r-- | doc/reference/tmpl/ephy-embed-persist.sgml | 2 | ||||
-rw-r--r-- | doc/reference/tmpl/ephy-embed-single.sgml | 7 | ||||
-rw-r--r-- | doc/reference/tmpl/ephy-embed.sgml | 15 | ||||
-rw-r--r-- | doc/reference/tmpl/ephy-extensions-manager.sgml | 5 | ||||
-rw-r--r-- | doc/reference/tmpl/ephy-node-db.sgml | 2 | ||||
-rw-r--r-- | embed/mozilla/EphyHeaderSniffer.cpp | 2 | ||||
-rw-r--r-- | embed/mozilla/EphyUtils.cpp | 2 | ||||
-rw-r--r-- | embed/mozilla/FilePicker.cpp | 12 | ||||
-rw-r--r-- | embed/mozilla/GtkNSSClientAuthDialogs.cpp | 4 | ||||
-rw-r--r-- | embed/mozilla/GtkNSSDialogs.cpp | 18 | ||||
-rw-r--r-- | embed/mozilla/GtkNSSKeyPairDialogs.cpp | 2 | ||||
-rw-r--r-- | embed/mozilla/GtkNSSSecurityWarningDialogs.cpp | 2 | ||||
-rw-r--r-- | embed/mozilla/MozDownload.cpp | 6 | ||||
-rw-r--r-- | embed/mozilla/mozilla-embed-persist.cpp | 6 | ||||
-rw-r--r-- | embed/mozilla/mozilla-embed-single.cpp | 8 | ||||
-rw-r--r-- | embed/mozilla/mozilla-notifiers.cpp | 2 | ||||
-rw-r--r-- | embed/mozilla/mozilla-x509-cert.cpp | 2 |
22 files changed, 100 insertions, 68 deletions
@@ -1,3 +1,27 @@ +2006-05-15 Christian Persch <chpe@cvs.gnome.org> + + === Release 2.14.1.1 === + + * NEWS: + * configure.ac: + +2006-05-15 Christian Persch <chpe@cvs.gnome.org> + + * embed/mozilla/EphyHeaderSniffer.cpp: + * embed/mozilla/EphyUtils.cpp: + * embed/mozilla/FilePicker.cpp: + * embed/mozilla/GtkNSSClientAuthDialogs.cpp: + * embed/mozilla/GtkNSSDialogs.cpp: + * embed/mozilla/GtkNSSKeyPairDialogs.cpp: + * embed/mozilla/GtkNSSSecurityWarningDialogs.cpp: + * embed/mozilla/MozDownload.cpp: + * embed/mozilla/mozilla-embed-persist.cpp: + * embed/mozilla/mozilla-embed-single.cpp: + * embed/mozilla/mozilla-notifiers.cpp: + * embed/mozilla/mozilla-x509-cert.cpp: + + Some castings. + 2006-05-14 Christian Persch <chpe@cvs.gnome.org> * lib/egg/eggtrayicon.c: (egg_tray_icon_class_init), @@ -1,5 +1,40 @@ +================= +Epiphany 2.14.1.1 +================= + +Changes: + * Add Esperanto (eo) to available languages in prefs + * Add -p as short option format for --private-instance + * Fix mnemonic activation of download path button [#339139] + * Fix accelerator assignment in Tabs menu [#339548] + * Monitor also directories, not just files [#332049] + * Fix crash with lockdown and zeroconf bookmarks [#341379] + * Fix build with gecko 1.8 branch + * Make status icon transparent [Patch from #150726] + * Documentation and man page updates + +Contributors to this release: + +Wouter Bolsterlee, Christian Persch, ZeBob + +Documentation: +Victor Osadci + +Translations: +Rostislav "zbrox" Raykov (bg), Progga (bn), Oublieuse (br), Lukas Novotny (cs), +Mindu Dorji (dz), Francisco Javier F. Serrador (es), Ivar Smolin (et), +Iñaki Larrañaga Murgoitio (eu), Benoît Dejean (fr), +Ignacio Casal Quinteiro (gl), Ankit Patel (gu), Mohammad DAMT (id), +Satoru SATOH (ja), ? (mg), Kjartan Maraas (nb), Reinout van Schouwen (nl), +Åsmund Skjæveland (nn), Kjartan Maraas (no), +Licio Fernando Nascimento da Fonseca (pt_BR), Duarte Loreto (pt), +Daniel Nylander (sv), Theppitak Karoonboonyanan (th), Baris Cicek (tr), +Maxim Dziumanenko (uk), and Clytie Siddall (vi). + + +=============== Epiphany 2.14.1 -============== +=============== Changes: * Hooks have been added for the new epiphany-extensions diff --git a/configure.ac b/configure.ac index 1937ee1ae..2fa6b0535 100644 --- a/configure.ac +++ b/configure.ac @@ -15,7 +15,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -AC_INIT([GNOME Web Browser],[2.14.1.90],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany]) +AC_INIT([GNOME Web Browser],[2.14.1.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany]) GNOME_COMMON_INIT @@ -278,10 +278,12 @@ GECKO_RUN_IFELSE([], [GECKO_XPCOM_PROGRAM( [[#include <nsIComponentRegistrar.h>]], [[ +status = 99; nsCOMPtr<nsIComponentRegistrar> registrar; rv = NS_GetComponentRegistrar (getter_AddRefs (registrar)); if (NS_FAILED (rv)) break; +status = 98; nsCID *classID = nsnull; rv = registrar->ContractIDToCID ("@mozilla.org/typeaheadfind;1", &classID); if (NS_FAILED (rv) || !classID) break; @@ -289,7 +291,7 @@ if (NS_FAILED (rv) || !classID) break; nsCID badClassID = { 0x46590685, 0xbc00, 0x4aac, { 0xab, 0xed, 0x2c, 0x10, 0xa5, 0xb9, 0x45, 0xa4 } }; -retval = ! classID->Equals (badClassID); +status = classID->Equals (badClassID) ? 97 : EXIT_SUCCESS; ]] )], [have_broken_typeaheadfind=no], diff --git a/doc/reference/tmpl/EphySingle.sgml b/doc/reference/tmpl/EphySingle.sgml index d745e9084..46149ea22 100644 --- a/doc/reference/tmpl/EphySingle.sgml +++ b/doc/reference/tmpl/EphySingle.sgml @@ -23,8 +23,6 @@ EphySingle </para> @Returns: -<!-- # Unused Parameters # --> -@aOwner: <!-- ##### FUNCTION Detach ##### --> diff --git a/doc/reference/tmpl/ephy-embed-factory.sgml b/doc/reference/tmpl/ephy-embed-factory.sgml index 81402a264..eda17fe3a 100644 --- a/doc/reference/tmpl/ephy-embed-factory.sgml +++ b/doc/reference/tmpl/ephy-embed-factory.sgml @@ -30,7 +30,5 @@ To create a new instance of an #EphyEmbed, #EphyEmbedPersist or @type: @Returns: -<!-- # Unused Parameters # --> -@object_id: diff --git a/doc/reference/tmpl/ephy-embed-persist.sgml b/doc/reference/tmpl/ephy-embed-persist.sgml index 1962ba30f..32fa72e63 100644 --- a/doc/reference/tmpl/ephy-embed-persist.sgml +++ b/doc/reference/tmpl/ephy-embed-persist.sgml @@ -115,8 +115,6 @@ save_page (EphyEmbed *embed, @persist: @value: -<!-- # Unused Parameters # --> -@Param2: <!-- ##### FUNCTION ephy_embed_persist_set_persist_key ##### --> diff --git a/doc/reference/tmpl/ephy-embed-single.sgml b/doc/reference/tmpl/ephy-embed-single.sgml index e76692999..8456dbde1 100644 --- a/doc/reference/tmpl/ephy-embed-single.sgml +++ b/doc/reference/tmpl/ephy-embed-single.sgml @@ -44,8 +44,6 @@ is used to perform browser-related actions which do not refer to an individual </para> @single: -<!-- # Unused Parameters # --> -@shell: <!-- ##### FUNCTION ephy_embed_single_clear_auth_cache ##### --> @@ -54,8 +52,6 @@ is used to perform browser-related actions which do not refer to an individual </para> @single: -<!-- # Unused Parameters # --> -@shell: <!-- ##### FUNCTION ephy_embed_single_get_font_list ##### --> @@ -66,9 +62,6 @@ is used to perform browser-related actions which do not refer to an individual @single: @lang_group: @Returns: -<!-- # Unused Parameters # --> -@shell: -@langGroup: <!-- ##### FUNCTION ephy_embed_single_open_window ##### --> diff --git a/doc/reference/tmpl/ephy-embed.sgml b/doc/reference/tmpl/ephy-embed.sgml index c23485784..5956b870c 100644 --- a/doc/reference/tmpl/ephy-embed.sgml +++ b/doc/reference/tmpl/ephy-embed.sgml @@ -169,9 +169,6 @@ be done by casting). @ephyembed: the object which received the signal. @arg1: -<!-- # Unused Parameters # --> -@Returns: -@arg2: <!-- ##### SIGNAL EphyEmbed::ge-popup-blocked ##### --> <para> @@ -326,6 +323,9 @@ be done by casting). @: @: @: +@: +@: +@: @: <!-- ##### SIGNAL EphyEmbed::ge-search-key-press ##### --> @@ -453,8 +453,6 @@ windows opened with JavaScript often use a nonstandard chrome. @embed: @force: -<!-- # Unused Parameters # --> -@flags: <!-- ##### FUNCTION ephy_embed_get_title ##### --> @@ -610,8 +608,6 @@ windows opened with JavaScript often use a nonstandard chrome. @embed: @zoom: -<!-- # Unused Parameters # --> -@reflow: <!-- ##### FUNCTION ephy_embed_get_zoom ##### --> @@ -631,9 +627,6 @@ windows opened with JavaScript often use a nonstandard chrome. @find: @search_string: @case_sensitive: -<!-- # Unused Parameters # --> -@embed: -@wrap_around: <!-- ##### FUNCTION ephy_embed_set_encoding ##### --> @@ -651,8 +644,6 @@ windows opened with JavaScript often use a nonstandard chrome. </para> @embed: -<!-- # Unused Parameters # --> -@info: <!-- ##### FUNCTION ephy_embed_print_preview_n_pages ##### --> diff --git a/doc/reference/tmpl/ephy-extensions-manager.sgml b/doc/reference/tmpl/ephy-extensions-manager.sgml index 1c20618b4..e7d7c7bae 100644 --- a/doc/reference/tmpl/ephy-extensions-manager.sgml +++ b/doc/reference/tmpl/ephy-extensions-manager.sgml @@ -24,9 +24,6 @@ EphyExtensionsManager @manager: @identifier: -<!-- # Unused Parameters # --> -@filename: -@Returns: <!-- ##### FUNCTION ephy_extensions_manager_unload ##### --> @@ -36,7 +33,5 @@ EphyExtensionsManager @manager: @identifier: -<!-- # Unused Parameters # --> -@filename: diff --git a/doc/reference/tmpl/ephy-node-db.sgml b/doc/reference/tmpl/ephy-node-db.sgml index 97c321d8b..49bc95913 100644 --- a/doc/reference/tmpl/ephy-node-db.sgml +++ b/doc/reference/tmpl/ephy-node-db.sgml @@ -119,7 +119,5 @@ A string identifier unique to this #EphyNodeDb @db: @id: @Returns: -<!-- # Unused Parameters # --> -@Param2: diff --git a/embed/mozilla/EphyHeaderSniffer.cpp b/embed/mozilla/EphyHeaderSniffer.cpp index de18a5ff4..2d79ea1be 100644 --- a/embed/mozilla/EphyHeaderSniffer.cpp +++ b/embed/mozilla/EphyHeaderSniffer.cpp @@ -226,7 +226,7 @@ EphyHeaderSniffer::GetInterface(const nsIID & uuid, void * *result) { EphyEmbedPersistFlags flags; - g_object_get (mEmbedPersist, "flags", &flags, NULL); + g_object_get (mEmbedPersist, "flags", &flags, (char *) NULL); if (flags & EPHY_EMBED_PERSIST_NO_CERTDIALOGS) { diff --git a/embed/mozilla/EphyUtils.cpp b/embed/mozilla/EphyUtils.cpp index a043b7e66..2fc8db723 100644 --- a/embed/mozilla/EphyUtils.cpp +++ b/embed/mozilla/EphyUtils.cpp @@ -254,7 +254,7 @@ EphyUtils::CollatePrintSettings (EmbedPrintInfo *info, const char *temp_dir; temp_dir = ephy_file_tmp_dir (); - base = g_build_filename (temp_dir, "printXXXXXX", NULL); + base = g_build_filename (temp_dir, "printXXXXXX", (char *) NULL); info->tempfile = ephy_file_tmp_filename (base, "ps"); g_free (base); diff --git a/embed/mozilla/FilePicker.cpp b/embed/mozilla/FilePicker.cpp index 43b6b3688..29f54bbbb 100644 --- a/embed/mozilla/FilePicker.cpp +++ b/embed/mozilla/FilePicker.cpp @@ -151,7 +151,7 @@ NS_IMETHODIMP GFilePicker::AppendFilters(PRInt32 filterMask) if (filterMask & nsIFilePicker::filterAll) { ephy_file_chooser_add_pattern_filter (mDialog, _("All files"), - "*", NULL); + "*", (char*) NULL); } if (filterMask & nsIFilePicker::filterHTML) { @@ -159,7 +159,7 @@ NS_IMETHODIMP GFilePicker::AppendFilters(PRInt32 filterMask) "text/html", "application/xhtml+xml", "text/xml", - NULL); + (char *) NULL); } if (filterMask & nsIFilePicker::filterText) { @@ -172,17 +172,17 @@ NS_IMETHODIMP GFilePicker::AppendFilters(PRInt32 filterMask) "image/png", "image/jpeg", "image/gif", - NULL); + (char *) NULL); } if (filterMask & nsIFilePicker::filterXML) { ephy_file_chooser_add_pattern_filter (mDialog, _("XML files"), - "*.xml", NULL); + "*.xml", (char *) NULL); } if (filterMask & nsIFilePicker::filterXUL) { ephy_file_chooser_add_pattern_filter (mDialog, _("XUL files"), - "*.xul", NULL); + "*.xul", (char *) NULL); } return NS_OK; @@ -362,7 +362,7 @@ NS_IMETHODIMP GFilePicker::SetDisplayDirectory(nsILocalFile *aDisplayDirectory) NS_UTF16ToCString (mDefaultString, NS_CSTRING_ENCODING_NATIVE_FILESYSTEM, defaultString); - char *filename = g_build_filename (dir.get(), defaultString.get(), NULL); + char *filename = g_build_filename (dir.get(), defaultString.get(), (char *) NULL); LOG ("Setting filename to %s", filename); gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (mDialog), filename); g_free (filename); diff --git a/embed/mozilla/GtkNSSClientAuthDialogs.cpp b/embed/mozilla/GtkNSSClientAuthDialogs.cpp index b5169823b..6d385b7fb 100644 --- a/embed/mozilla/GtkNSSClientAuthDialogs.cpp +++ b/embed/mozilla/GtkNSSClientAuthDialogs.cpp @@ -161,7 +161,7 @@ GtkNSSClientAuthDialogs::ChooseCertificate (nsIInterfaceRequestor *ctx, GTK_RESPONSE_CANCEL, _("_Select Certificate"), GTK_RESPONSE_OK, - NULL); + (char *) NULL); if (gparent) { @@ -240,7 +240,7 @@ GtkNSSClientAuthDialogs::ChooseCertificate (nsIInterfaceRequestor *ctx, gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE); gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), renderer, "text", 0, - NULL); + (char *) NULL); gtk_widget_show (combo); gtk_box_pack_start (GTK_BOX (vbox), combo, FALSE, TRUE, 0); diff --git a/embed/mozilla/GtkNSSDialogs.cpp b/embed/mozilla/GtkNSSDialogs.cpp index c6489cf06..a00088eac 100644 --- a/embed/mozilla/GtkNSSDialogs.cpp +++ b/embed/mozilla/GtkNSSDialogs.cpp @@ -228,7 +228,7 @@ display_cert_warning_box (nsIInterfaceRequestor *ctx, dialog = gtk_dialog_new_with_buttons ("", gparent, GTK_DIALOG_DESTROY_WITH_PARENT, - NULL); + (char *) NULL); if (gparent) { gtk_window_group_add_window (ephy_gui_ensure_window_group (gparent), @@ -498,7 +498,7 @@ GtkNSSDialogs::NotifyCrlNextupdate (nsIInterfaceRequestor *ctx, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_OK, GTK_RESPONSE_OK, - NULL); + (char *) NULL); gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser"); @@ -563,7 +563,7 @@ GtkNSSDialogs::ConfirmDownloadCACert(nsIInterfaceRequestor *ctx, NSSDIALOG_RESPONSE_VIEW_CERT, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, _("_Trust CA"), GTK_RESPONSE_ACCEPT, - NULL); + (char *) NULL); if (gparent) { @@ -646,7 +646,7 @@ GtkNSSDialogs::NotifyCACertExists (nsIInterfaceRequestor *ctx) GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_OK, GTK_RESPONSE_OK, - NULL); + (char *) NULL); if (gparent) { @@ -778,7 +778,7 @@ GtkNSSDialogs::SetPKCS12FilePassword(nsIInterfaceRequestor *ctx, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - NULL); + (char *) NULL); if (gparent) { @@ -901,7 +901,7 @@ GtkNSSDialogs::GetPKCS12FilePassword(nsIInterfaceRequestor *ctx, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, _("I_mport Certificate"), GTK_RESPONSE_OK, - NULL); + (char *) NULL); if (gparent) { @@ -1003,7 +1003,7 @@ GtkNSSDialogs::CrlImportStatusDialog(nsIInterfaceRequestor *ctx, nsICRLInfo *crl GTK_WINDOW (gparent), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_OK, GTK_RESPONSE_OK, - NULL); + (char *) NULL); gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser"); gtk_window_set_title (GTK_WINDOW (dialog), _("Certificate Revocation List Imported")); @@ -1282,7 +1282,7 @@ setup_view_cert_tree (GtkWidget *dialog, GladeXML*gxml, nsIArray *certChain) 0, "Certificate", renderer, "text", 0, - NULL); + (char *) NULL); GtkTreeSelection *select = gtk_tree_view_get_selection (GTK_TREE_VIEW (chain_tree_view)); gtk_tree_selection_set_mode (select, GTK_SELECTION_SINGLE); @@ -1303,7 +1303,7 @@ setup_view_cert_tree (GtkWidget *dialog, GladeXML*gxml, nsIArray *certChain) 0, "Certificate Field", renderer, "text", 0, - NULL); + (char *) NULL); select = gtk_tree_view_get_selection (GTK_TREE_VIEW (field_tree_view)); gtk_tree_selection_set_mode (select, GTK_SELECTION_SINGLE); diff --git a/embed/mozilla/GtkNSSKeyPairDialogs.cpp b/embed/mozilla/GtkNSSKeyPairDialogs.cpp index e5f5c35cd..c25076306 100644 --- a/embed/mozilla/GtkNSSKeyPairDialogs.cpp +++ b/embed/mozilla/GtkNSSKeyPairDialogs.cpp @@ -207,7 +207,7 @@ GtkNSSKeyPairDialogs::DisplayGeneratingKeypairInfo (nsIInterfaceRequestor *ctx, GtkWindow *gparent = GTK_WINDOW (EphyUtils::FindGtkParent (parent)); dialog = gtk_dialog_new_with_buttons ("", gparent, - GTK_DIALOG_DESTROY_WITH_PARENT, NULL); + GTK_DIALOG_DESTROY_WITH_PARENT, (char *) NULL); if (gparent) { diff --git a/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp b/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp index 72b722aae..19868253a 100644 --- a/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp +++ b/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp @@ -213,7 +213,7 @@ GtkNSSSecurityWarningDialogs::DoDialog (nsIInterfaceRequestor *aContext, PRBool showOnce = PR_FALSE; if (!show && prefBranch && aPrefName) { - showOncePref = g_strconcat (aPrefName, ".show_once", NULL); + showOncePref = g_strconcat (aPrefName, ".show_once", (char *) NULL); rv = prefBranch->GetBoolPref (showOncePref, &showOnce); if (NS_FAILED (rv)) showOnce = PR_FALSE; } diff --git a/embed/mozilla/MozDownload.cpp b/embed/mozilla/MozDownload.cpp index 8aa2ad334..b7b016b2e 100644 --- a/embed/mozilla/MozDownload.cpp +++ b/embed/mozilla/MozDownload.cpp @@ -607,7 +607,7 @@ MozDownload::GetInterface(const nsIID & uuid, void * *result) { EphyEmbedPersistFlags flags; - g_object_get (mEmbedPersist, "flags", &flags, NULL); + g_object_get (mEmbedPersist, "flags", &flags, (char *) NULL); if (flags & EPHY_EMBED_PERSIST_NO_CERTDIALOGS) { @@ -782,12 +782,12 @@ GetFilePath (const char *filename) if (ephy_ensure_dir_exists (download_dir, NULL)) { - path = g_build_filename (download_dir, filename, NULL); + path = g_build_filename (download_dir, filename, (char *) NULL); } else { home_dir = g_get_home_dir (); - path = g_build_filename (home_dir ? home_dir : "/", filename, NULL); + path = g_build_filename (home_dir ? home_dir : "/", filename, (char *) NULL); } g_free (download_dir); diff --git a/embed/mozilla/mozilla-embed-persist.cpp b/embed/mozilla/mozilla-embed-persist.cpp index 990ed0fbd..c3c1da6b0 100644 --- a/embed/mozilla/mozilla-embed-persist.cpp +++ b/embed/mozilla/mozilla-embed-persist.cpp @@ -164,7 +164,7 @@ impl_save (EphyEmbedPersist *persist) "flags", &flags, "embed", &embed, "max_size", &max_size, - NULL); + (char *) NULL); g_return_val_if_fail (!(flags & EPHY_EMBED_PERSIST_COPY_PAGE) || embed != NULL, FALSE); @@ -294,7 +294,7 @@ impl_save (EphyEmbedPersist *persist) { /* Get a temp filename to save to */ char *tmp_filename, *base; - base = g_build_filename (g_get_tmp_dir (), "sav-XXXXXX", NULL); + base = g_build_filename (g_get_tmp_dir (), "sav-XXXXXX", (char *) NULL); tmp_filename = ephy_file_tmp_filename (base, "html"); g_free (base); if (tmp_filename == NULL) return FALSE; @@ -353,7 +353,7 @@ impl_to_string (EphyEmbedPersist *persist) g_object_get (persist, "flags", &flags, "embed", &embed, - NULL); + (char *) NULL); g_object_unref (persist); g_return_val_if_fail (embed != NULL, NULL); diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp index ba0f93115..b46b3eb15 100644 --- a/embed/mozilla/mozilla-embed-single.cpp +++ b/embed/mozilla/mozilla-embed-single.cpp @@ -421,7 +421,7 @@ mozilla_init_plugin_path () #ifdef HAVE_PRIVATE_PLUGINS ":" PLUGINDIR, #endif - NULL); + (char *) NULL); g_setenv ("MOZ_PLUGIN_PATH", new_path, TRUE); g_free (new_path); @@ -451,7 +451,7 @@ mozilla_init_profile (void) char *profile_path; profile_path = g_build_filename (ephy_dot_dir (), MOZILLA_PROFILE_DIR, - NULL); + (char *) NULL); gtk_moz_embed_set_profile_path (profile_path, MOZILLA_PROFILE_NAME); g_free (profile_path); } @@ -676,7 +676,7 @@ mozilla_stylesheet_init (MozillaEmbedSingle *single) priv->user_css_file = g_build_filename (ephy_dot_dir (), USER_STYLESHEET_FILENAME, - NULL); + (char *) NULL); user_css_enabled_notify (NULL, 0, NULL, single); priv->user_css_enabled_notifier_id = @@ -801,7 +801,7 @@ mozilla_embed_single_init (MozillaEmbedSingle *mes) MOZILLA_PROFILE_DIR, MOZILLA_PROFILE_NAME, MOZILLA_PROFILE_FILE, - NULL); + (char *) NULL); g_signal_connect_object (embed_shell, "prepare-close", G_CALLBACK (prepare_close_cb), mes, diff --git a/embed/mozilla/mozilla-notifiers.cpp b/embed/mozilla/mozilla-notifiers.cpp index 153c8df73..1bdfbd170 100644 --- a/embed/mozilla/mozilla-notifiers.cpp +++ b/embed/mozilla/mozilla-notifiers.cpp @@ -645,7 +645,7 @@ mozilla_get_dpi () if (g_object_class_find_property (G_OBJECT_GET_CLASS (G_OBJECT (settings)), "gtk-xft-dpi")) { - g_object_get (G_OBJECT (settings), "gtk-xft-dpi", &dpi, NULL); + g_object_get (G_OBJECT (settings), "gtk-xft-dpi", &dpi, (char *) NULL); if (dpi) return INT_ROUND (dpi / PANGO_SCALE); } diff --git a/embed/mozilla/mozilla-x509-cert.cpp b/embed/mozilla/mozilla-x509-cert.cpp index c80ee918d..98a051f38 100644 --- a/embed/mozilla/mozilla-x509-cert.cpp +++ b/embed/mozilla/mozilla-x509-cert.cpp @@ -258,6 +258,6 @@ mozilla_x509_cert_new (nsIX509Cert *moz_cert) cert = (MozillaX509Cert*)g_object_new (MOZILLA_TYPE_X509_CERT, "mozilla-cert", moz_cert, - NULL); + (char *) NULL); return cert; } |