svnno****@sourc*****
svnno****@sourc*****
Fri Feb 22 13:21:36 JST 2008
Revision: 3389
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3389
Author: ikezoe
Date: 2008-02-22 13:21:35 +0900 (Fri, 22 Feb 2008)
Log Message:
-----------
suppress warnings.
Modified Paths:
--------------
kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp
kazehakase/trunk/module/embed/gecko/kz-gecko-single.cpp
kazehakase/trunk/module/embed/gecko/kz-mozutils.cpp
kazehakase/trunk/module/embed/gecko/kz-mozwrapper.cpp
Modified: kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp 2008-02-22 02:22:44 UTC (rev 3388)
+++ kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp 2008-02-22 04:21:35 UTC (rev 3389)
@@ -562,7 +562,6 @@
kz_gecko_embed_class_init (KzGeckoEmbedClass *klass)
{
GObjectClass *gobject_class;
- GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
GtkMozEmbedClass *moz_embed_class;
@@ -662,7 +661,6 @@
{
GObject *object;
GObjectClass *klass = G_OBJECT_CLASS(kz_gecko_embed_parent_class);
- gchar *title;
object = klass->constructor(type, n_props, props);
@@ -819,7 +817,6 @@
g_return_if_fail(KZ_IS_GECKO_EMBED(kzembed));
- KzGeckoEmbed *mozembed = KZ_GECKO_EMBED(kzembed);
KzGeckoEmbedPrivate *priv = KZ_GECKO_EMBED_GET_PRIVATE (kzembed);
if (url && *url)
@@ -1715,7 +1712,6 @@
const PRUnichar span[] = { 's', 'p', 'a', 'n' ,'\0' };
const PRUnichar style[] = { 's', 't', 'y', 'l' ,'e', '\0' };
- const PRUnichar u_color[] = { 's', 'p', 'a', 'n' ,'\0' };
const PRUnichar id[] = { 'i', 'd', '\0' };
const PRUnichar sc[] = { ';', '\0' };
const PRUnichar bg_color[] = { 'b', 'a', 'c', 'k' ,'g', 'r',
@@ -1969,7 +1965,6 @@
{
g_return_val_if_fail(KZ_IS_GECKO_EMBED(kzembed), TRUE);
- KzGeckoEmbed *mozembed = KZ_GECKO_EMBED(kzembed);
KzGeckoEmbedPrivate *priv = KZ_GECKO_EMBED_GET_PRIVATE (kzembed);
if (!priv->wrapper) return TRUE;
@@ -1992,7 +1987,6 @@
gboolean selected_only)
{
g_return_val_if_fail(KZ_IS_GECKO_EMBED(kzembed), FALSE);
- KzGeckoEmbed *mozembed = KZ_GECKO_EMBED(kzembed);
KzGeckoEmbedPrivate *priv = KZ_GECKO_EMBED_GET_PRIVATE (kzembed);
g_return_val_if_fail(priv->wrapper, FALSE);
g_return_val_if_fail(list, FALSE);
@@ -2026,7 +2020,6 @@
kz_gecko_embed_get_dest_anchors (KzEmbed *kzembed, GList **list)
{
g_return_val_if_fail(KZ_IS_GECKO_EMBED(kzembed), FALSE);
- KzGeckoEmbed *mozembed = KZ_GECKO_EMBED(kzembed);
KzGeckoEmbedPrivate *priv = KZ_GECKO_EMBED_GET_PRIVATE (kzembed);
g_return_val_if_fail(priv->wrapper, FALSE);
g_return_val_if_fail(list, FALSE);
@@ -2373,6 +2366,9 @@
case KZ_EMBED_RELOAD_CHARSET_CHANGE:
moz_flags = GTK_MOZ_EMBED_FLAG_RELOADCHARSETCHANGE;
break;
+ default:
+ moz_flags = GTK_MOZ_EMBED_FLAG_RELOADNORMAL;
+ break;
}
gtk_moz_embed_reload(GTK_MOZ_EMBED(kzembed), moz_flags);
@@ -2473,7 +2469,7 @@
if (n >= len)
{
- int i;
+ guint i;
for (i = len; i < n; i++)
{
priv->nav_links[link] =
@@ -2601,7 +2597,6 @@
{
g_return_if_fail(KZ_IS_GECKO_EMBED(kzembed));
- KzGeckoEmbed *mozembed = KZ_GECKO_EMBED(kzembed);
KzGeckoEmbedPrivate *priv = KZ_GECKO_EMBED_GET_PRIVATE (kzembed);
KzMozWrapper *wrapper = priv->wrapper;
nsresult rv;
@@ -2934,7 +2929,6 @@
wrapper->CreateThumbnail(uri, last_modified, size);
#else
- nsresult rv;
GdkDrawable *window;
gint width, height;
GdkPixbuf *pixbuf, *thumbnail;
@@ -3202,7 +3196,6 @@
doc->GetLastModified(value);
- guint mod_time = 0;
nsEmbedCString cValue;
NS_UTF16ToCString(value,
NS_CSTRING_ENCODING_UTF8, cValue);
Modified: kazehakase/trunk/module/embed/gecko/kz-gecko-single.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-gecko-single.cpp 2008-02-22 02:22:44 UTC (rev 3388)
+++ kazehakase/trunk/module/embed/gecko/kz-gecko-single.cpp 2008-02-22 04:21:35 UTC (rev 3389)
@@ -226,7 +226,6 @@
static gchar *
convert_preference_name (const gchar *prefix, const gchar *key)
{
- gint i = 0;
gchar *ret;
ret = g_strdup_printf("%s.%s", prefix, key);
@@ -423,8 +422,6 @@
const gchar *old_value,
gpointer data)
{
- gchar *converted_key;
-
switch (key[0])
{
case 'c':// cookie
Modified: kazehakase/trunk/module/embed/gecko/kz-mozutils.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-mozutils.cpp 2008-02-22 02:22:44 UTC (rev 3388)
+++ kazehakase/trunk/module/embed/gecko/kz-mozutils.cpp 2008-02-22 04:21:35 UTC (rev 3389)
@@ -81,6 +81,6 @@
rv = ioService->NewURI (cSpec, nsnull, nsnull, result);
+ return NS_SUCCEEDED(rv);
}
-
Modified: kazehakase/trunk/module/embed/gecko/kz-mozwrapper.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-mozwrapper.cpp 2008-02-22 02:22:44 UTC (rev 3388)
+++ kazehakase/trunk/module/embed/gecko/kz-mozwrapper.cpp 2008-02-22 04:21:35 UTC (rev 3389)
@@ -930,7 +930,6 @@
{
const PRUnichar dq[] = { '"', '\0' };
const PRUnichar sp[] = { ' ', '\0' };
- const PRUnichar sl[] = { '/', '\0' };
const PRUnichar lt[] = { '<', '\0' };
const PRUnichar gt[] = { '>', '\0' };
const PRUnichar cr[] = { '\n', '\0' };
@@ -1436,12 +1435,12 @@
nsresult
KzMozWrapper::GetPrinterList (GList **list)
{
- GList *printers = NULL;
- nsresult rv = NS_OK;
#ifndef HAVE_NSIPRINTOPTIONS_AVAILABLEPRINTERS
*list = NULL;
#else
+ GList *printers = NULL;
+ nsresult rv = NS_OK;
nsCOMPtr<nsIPrintSettingsService> pss =
do_GetService("@mozilla.org/gfx/printsettings-service;1", &rv);
NS_ENSURE_SUCCESS(rv, nsnull);
@@ -1861,21 +1860,12 @@
if (!iStream || NS_FAILED(rv)) return NS_ERROR_FAILURE;
- char *aBuf;
- PRUint32 aCount;
- PRUint32 ret;
-
- rv = iStream->Read(aBuf, 1024, &ret);
-
- g_warning("%s", aBuf);
-
return rv;
}
nsresult
KzMozWrapper::SetPostData (nsIHistoryEntry *he, const nsAString &postData)
{
- nsresult rv;
#if 0
nsCOMPtr<nsISHEntry> she = do_QueryInterface (he);
@@ -1886,7 +1876,7 @@
rv = she->SetPostData(iStream);
#endif
- return rv;
+ return NS_OK;
}
// this function is picked from galeon-1.3.18