[kazehakase-svn] [3841] * src/bookmarks/kz-bookmark.c: Remove dispose.

Back to archive index

svnno****@sourc***** svnno****@sourc*****
Fri Sep 11 12:37:19 JST 2009


Revision: 3841
          http://sourceforge.jp/projects/kazehakase/svn/view?view=rev&revision=3841
Author:   ikezoe
Date:     2009-09-11 12:37:19 +0900 (Fri, 11 Sep 2009)

Log Message:
-----------
	* src/bookmarks/kz-bookmark.c: Remove dispose.
	* src/bookmarks/kz-xbel.c: Use ternary operator.

Modified Paths:
--------------
    kazehakase/trunk/ChangeLog
    kazehakase/trunk/src/bookmarks/kz-bookmark.c
    kazehakase/trunk/src/bookmarks/kz-xbel.c

Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog	2009-09-11 03:37:18 UTC (rev 3840)
+++ kazehakase/trunk/ChangeLog	2009-09-11 03:37:19 UTC (rev 3841)
@@ -4,6 +4,8 @@
 	src/prefs/prefs_font.c: Now font list are obtained with
 	pango functions.
 	* src/kz-xml.c: Add kz_xml_attr_new.
+	* src/bookmarks/kz-bookmark.c: Remove dispose.
+	* src/bookmarks/kz-xbel.c: Use ternary operator.
 
 2009-09-10  Hiroyuki Ikezoe  <poinc****@ikezo*****>
 

Modified: kazehakase/trunk/src/bookmarks/kz-bookmark.c
===================================================================
--- kazehakase/trunk/src/bookmarks/kz-bookmark.c	2009-09-11 03:37:18 UTC (rev 3840)
+++ kazehakase/trunk/src/bookmarks/kz-bookmark.c	2009-09-11 03:37:19 UTC (rev 3841)
@@ -47,7 +47,6 @@
 };
 
 
-static void dispose      (GObject         *object);
 static void set_property (GObject         *object,
                           guint            prop_id,
                           const GValue    *value,
@@ -75,7 +74,6 @@
 
 	object_class = G_OBJECT_CLASS(klass);
 
-	object_class->dispose      = dispose;
 	object_class->set_property = set_property;
 	object_class->get_property = get_property;
 
@@ -183,14 +181,6 @@
 
 
 static void
-dispose (GObject *object)
-{
-	if (G_OBJECT_CLASS (kz_bookmark_parent_class)->dispose)
-		G_OBJECT_CLASS (kz_bookmark_parent_class)->dispose(object);
-}
-
-
-static void
 set_property (GObject *object,
               guint prop_id,
               const GValue *value,

Modified: kazehakase/trunk/src/bookmarks/kz-xbel.c
===================================================================
--- kazehakase/trunk/src/bookmarks/kz-xbel.c	2009-09-11 03:37:18 UTC (rev 3840)
+++ kazehakase/trunk/src/bookmarks/kz-xbel.c	2009-09-11 03:37:19 UTC (rev 3841)
@@ -1479,12 +1479,9 @@
 		KzXMLNode *metanode;
 		const gchar *str;
 		gboolean lock = g_value_get_boolean(&value);
-		
-		if (lock)
-			str = "yes";
-		else
-			str = "no";
 
+		str = lock ? "yes" : "no";
+
 		metanode = xml_node_find_metadata_node(node);
 	
 		if (!metanode)
@@ -1498,10 +1495,7 @@
 		const gchar *str;
 		gboolean auto_refresh = g_value_get_boolean(&value);
 		
-		if (auto_refresh)
-			str = "yes";
-		else
-			str = "no";
+		str = auto_refresh ? "yes" : "no";
 
 		metanode = xml_node_find_metadata_node(node);
 	
@@ -1516,10 +1510,7 @@
 		const gchar *str;
 		gboolean javascript = g_value_get_boolean(&value);
 		
-		if (javascript)
-			str = "yes";
-		else
-			str = "no";
+		str = javascript ? "yes" : "no";
 
 		metanode = xml_node_find_metadata_node(node);
 	




More information about the Kazehakase-cvs mailing list
Back to archive index