aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog20
-rw-r--r--embed/mozilla/EphyWrapper.cpp2
-rw-r--r--embed/mozilla/EphyWrapper.h2
-rw-r--r--embed/mozilla/mozilla-embed.cpp11
-rwxr-xr-xembed/print-dialog.c2
5 files changed, 28 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 0653e3ec4..dbd112593 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2003-03-15 Marco Pesenti Gritti <marco@it.gnome.org>
+
+ * embed/mozilla/EphyWrapper.cpp:
+ * embed/mozilla/EphyWrapper.h:
+ * embed/mozilla/mozilla-embed.cpp:
+
+ Reload embed when changing charset
+
+ * embed/print-dialog.c: (print_get_info):
+
+ Correct colors flag
+
+2003-03-15 Marco Pesenti Gritti <marco@it.gnome.org>
+
+ * embed/mozilla/EphyWrapper.cpp:
+ * embed/mozilla/EphyWrapper.h:
+ * embed/mozilla/MozRegisterComponents.cpp:
+ * embed/mozilla/mozilla-embed.cpp:
+ * embed/print-dialog.c: (print_get_info):
+
2003-03-14 Xan Lopez <xan@masilla.org>
* src/ephy-main.c: (main):
diff --git a/embed/mozilla/EphyWrapper.cpp b/embed/mozilla/EphyWrapper.cpp
index 3635b3649..fcde13437 100644
--- a/embed/mozilla/EphyWrapper.cpp
+++ b/embed/mozilla/EphyWrapper.cpp
@@ -726,7 +726,7 @@ nsresult EphyWrapper::CopyHistoryTo (EphyWrapper *dest)
return NS_OK;
}
-nsresult EphyWrapper::ForceCharacterSet (char *charset)
+nsresult EphyWrapper::ForceCharacterSet (const char *charset)
{
nsresult result;
diff --git a/embed/mozilla/EphyWrapper.h b/embed/mozilla/EphyWrapper.h
index 8f6a3672a..d083da44a 100644
--- a/embed/mozilla/EphyWrapper.h
+++ b/embed/mozilla/EphyWrapper.h
@@ -75,7 +75,7 @@ public:
nsresult GoToHistoryIndex (PRInt16 index);
- nsresult ForceCharacterSet (char *charset);
+ nsresult ForceCharacterSet (const char *charset);
nsresult CanCutSelection(PRBool *result);
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp
index fe79c0ae9..467fcbfa1 100644
--- a/embed/mozilla/mozilla-embed.cpp
+++ b/embed/mozilla/mozilla-embed.cpp
@@ -1169,16 +1169,15 @@ impl_set_charset (EphyEmbed *embed,
{
nsresult result = NS_OK;
EphyWrapper *wrapper;
- char *cset;
-
- cset = g_strdup (charset);
wrapper = MOZILLA_EMBED(embed)->priv->wrapper;
g_return_val_if_fail (wrapper != NULL, G_FAILED);
- wrapper->ForceCharacterSet (cset);
-
- g_free (cset);
+ result = wrapper->ForceCharacterSet (charset);
+ if (NS_FAILED (result)) return G_FAILED;
+
+ gtk_moz_embed_reload (GTK_MOZ_EMBED (embed),
+ GTK_MOZ_EMBED_FLAG_RELOADCHARSETCHANGE);
return NS_SUCCEEDED(result) ? G_OK : G_FAILED;
}
diff --git a/embed/print-dialog.c b/embed/print-dialog.c
index 09929376c..7ea025fa1 100755
--- a/embed/print-dialog.c
+++ b/embed/print-dialog.c
@@ -296,7 +296,7 @@ print_get_info (EphyDialog *dialog)
info->pages = g_value_get_int (&pages);
ephy_dialog_get_value (dialog, COLOR_PROP, &print_color);
- info->print_color = g_value_get_int (&print_color);
+ info->print_color = !g_value_get_int (&print_color);
ephy_dialog_get_value (dialog, ORIENTATION_PROP, &orientation);
info->orientation = g_value_get_int (&orientation);