aboutsummaryrefslogtreecommitdiffstats
path: root/embed/mozilla
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2006-03-06 04:54:32 +0800
committerChristian Persch <chpe@src.gnome.org>2006-03-06 04:54:32 +0800
commitd791244c78d9f1d2a8d04135e7de59a3bfa28237 (patch)
tree80d6235f8d9e2d241d253b240ae7f81cd2aff34c /embed/mozilla
parent8fbc5afdd03d2fe502610d39eb691fe9aca932be (diff)
downloadgsoc2013-epiphany-d791244c78d9f1d2a8d04135e7de59a3bfa28237.tar
gsoc2013-epiphany-d791244c78d9f1d2a8d04135e7de59a3bfa28237.tar.gz
gsoc2013-epiphany-d791244c78d9f1d2a8d04135e7de59a3bfa28237.tar.bz2
gsoc2013-epiphany-d791244c78d9f1d2a8d04135e7de59a3bfa28237.tar.lz
gsoc2013-epiphany-d791244c78d9f1d2a8d04135e7de59a3bfa28237.tar.xz
gsoc2013-epiphany-d791244c78d9f1d2a8d04135e7de59a3bfa28237.tar.zst
gsoc2013-epiphany-d791244c78d9f1d2a8d04135e7de59a3bfa28237.zip
Don't use g_return_if_fail here.
2006-03-05 Christian Persch <chpe@cvs.gnome.org> * embed/mozilla/mozilla-embed-find.cpp: Don't use g_return_if_fail here. * embed/mozilla/mozilla-embed-single.cpp: Remove fixed FIXME.
Diffstat (limited to 'embed/mozilla')
-rw-r--r--embed/mozilla/AutoJSContextStack.cpp2
-rw-r--r--embed/mozilla/AutoJSContextStack.h2
-rw-r--r--embed/mozilla/EphyPromptService.cpp2
-rw-r--r--embed/mozilla/EphyPromptService.h2
-rw-r--r--embed/mozilla/mozilla-embed-find.cpp4
-rw-r--r--embed/mozilla/mozilla-embed-single.cpp1
6 files changed, 5 insertions, 8 deletions
diff --git a/embed/mozilla/AutoJSContextStack.cpp b/embed/mozilla/AutoJSContextStack.cpp
index 0098f19eb..6d61a30d5 100644
--- a/embed/mozilla/AutoJSContextStack.cpp
+++ b/embed/mozilla/AutoJSContextStack.cpp
@@ -9,7 +9,7 @@
* 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.
+ * GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software
diff --git a/embed/mozilla/AutoJSContextStack.h b/embed/mozilla/AutoJSContextStack.h
index 5f4069293..0b2ebb129 100644
--- a/embed/mozilla/AutoJSContextStack.h
+++ b/embed/mozilla/AutoJSContextStack.h
@@ -9,7 +9,7 @@
* 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.
+ * GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software
diff --git a/embed/mozilla/EphyPromptService.cpp b/embed/mozilla/EphyPromptService.cpp
index b7e8e8dcd..c360dcbc4 100644
--- a/embed/mozilla/EphyPromptService.cpp
+++ b/embed/mozilla/EphyPromptService.cpp
@@ -9,7 +9,7 @@
* 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.
+ * GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software
diff --git a/embed/mozilla/EphyPromptService.h b/embed/mozilla/EphyPromptService.h
index 064ccf402..fb5dc1b70 100644
--- a/embed/mozilla/EphyPromptService.h
+++ b/embed/mozilla/EphyPromptService.h
@@ -9,7 +9,7 @@
* 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.
+ * GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software
diff --git a/embed/mozilla/mozilla-embed-find.cpp b/embed/mozilla/mozilla-embed-find.cpp
index 1c057f577..1f3597c7e 100644
--- a/embed/mozilla/mozilla-embed-find.cpp
+++ b/embed/mozilla/mozilla-embed-find.cpp
@@ -46,9 +46,7 @@ impl_set_embed (EphyEmbedFind *efind,
MozillaEmbedFind *find = MOZILLA_EMBED_FIND (efind);
MozillaEmbedFindPrivate *priv = find->priv;
- nsresult rv;
- rv = priv->find->SetEmbed (embed);
- g_return_if_fail (NS_SUCCEEDED (rv));
+ priv->find->SetEmbed (embed);
}
static void
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp
index 5b1812170..ba0f93115 100644
--- a/embed/mozilla/mozilla-embed-single.cpp
+++ b/embed/mozilla/mozilla-embed-single.cpp
@@ -296,7 +296,6 @@ mozilla_set_default_prefs (MozillaEmbedSingle *mes)
}
#ifdef HAVE_GECKO_1_8
- /* FIXME: maybe only set the major version ("1.6", "1.8") here? */
pref->SetCharPref ("general.useragent.extra.epiphany", "Epiphany/" EPIPHANY_MAJOR);
/* Unset old prefs, otherwise they end up in the user agent string too */