svnno****@sourc*****
svnno****@sourc*****
Fri Sep 4 09:58:30 JST 2009
Revision: 3829
http://sourceforge.jp/projects/kazehakase/svn/view?view=rev&revision=3829
Author: ikezoe
Date: 2009-09-04 09:58:30 +0900 (Fri, 04 Sep 2009)
Log Message:
-----------
* module/embed/gecko/kz-gecko-embed.cpp,
module/embed/ie/kz-ie.c: g_free() accepts NULL.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp
kazehakase/trunk/module/embed/ie/kz-ie.c
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2009-09-04 00:53:35 UTC (rev 3828)
+++ kazehakase/trunk/ChangeLog 2009-09-04 00:58:30 UTC (rev 3829)
@@ -15,6 +15,8 @@
* src/kz-embed.[ch]: Remove get_location interface.
* src/kz-embed.[ch]: Remove get_progress interface.
* src/kz-embed.[ch]: Remove is_loading interface.
+ * module/embed/gecko/kz-gecko-embed.cpp,
+ module/embed/ie/kz-ie.c: g_free() accepts NULL.
2009-09-02 Hiroyuki Ikezoe <poinc****@ikezo*****>
Modified: kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp 2009-09-04 00:53:35 UTC (rev 3828)
+++ kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp 2009-09-04 00:58:30 UTC (rev 3829)
@@ -2377,7 +2377,7 @@
NS_CStringToUTF16(nsEmbedCString(datapath),
NS_CSTRING_ENCODING_UTF8, DataPath);
NS_NewLocalFile(DataPath, PR_TRUE, getter_AddRefs(path));
- g_free (datapath);
+ g_free(datapath);
KzGeckoEmbedPrivate *priv = KZ_GECKO_EMBED_GET_PRIVATE (kzembed);
wrapper = priv->wrapper;
@@ -2895,12 +2895,10 @@
}
}
#ifdef USE_MIGEMO
- if (priv->migemo_keyword)
- g_free(priv->migemo_keyword);
+ g_free(priv->migemo_keyword);
priv->migemo_keyword =NULL;
#endif
- if (priv->last_highlight)
- g_free(priv->last_highlight);
+ g_free(priv->last_highlight);
priv->last_highlight = NULL;
}
Modified: kazehakase/trunk/module/embed/ie/kz-ie.c
===================================================================
--- kazehakase/trunk/module/embed/ie/kz-ie.c 2009-09-04 00:53:35 UTC (rev 3828)
+++ kazehakase/trunk/module/embed/ie/kz-ie.c 2009-09-04 00:58:30 UTC (rev 3829)
@@ -660,7 +660,7 @@
string = gtk_ie_embed_get_last_modified(GTK_IE_EMBED(kzembed));
strptime(string, "%m/%d/%C %H:%M:%S", &t);
- g_free (string);
+ g_free(string);
return (guint) mktime(&t);
}