diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | embed/mozilla/AutoJSContextStack.cpp | 2 | ||||
| -rw-r--r-- | embed/mozilla/AutoJSContextStack.h | 2 | ||||
| -rw-r--r-- | embed/mozilla/EphyPromptService.cpp | 2 | ||||
| -rw-r--r-- | embed/mozilla/EphyPromptService.h | 2 | ||||
| -rw-r--r-- | embed/mozilla/mozilla-embed-find.cpp | 4 | ||||
| -rw-r--r-- | embed/mozilla/mozilla-embed-single.cpp | 1 |
7 files changed, 15 insertions, 8 deletions
@@ -1,5 +1,15 @@ 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. + +2006-03-05 Christian Persch <chpe@cvs.gnome.org> + * data/epiphany-fonts.schemas: * data/generate-font-schemas.py: 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 */ |