[nautilus-actions] Fix test of virtual functions which caused double calls



commit 4097a70138ac7ab0ea1f3de32818cd7efc635c27
Author: Pierre Wieser <pwieser trychlos org>
Date:   Sun Aug 23 11:37:05 2009 +0200

    Fix test of virtual functions which caused double calls

 ChangeLog                   |    1 +
 src/nact/base-application.c |   10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 690e858..f3fb65a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
 	* src/nact/base-application.c:
 	Fix #592781: use explicit format strings.
+	Fix test of virtual functions which caused double calls.
 
 2009-08-21 Pierre Wieser <pwieser trychlos org>
 
diff --git a/src/nact/base-application.c b/src/nact/base-application.c
index 62402a1..11ef711 100644
--- a/src/nact/base-application.c
+++ b/src/nact/base-application.c
@@ -455,7 +455,7 @@ base_application_get_application_name( BaseApplication *application )
 
 	gchar *name = NULL;
 
-	if( BASE_APPLICATION_GET_CLASS( application )->application_get_application_name( application )){
+	if( BASE_APPLICATION_GET_CLASS( application )->application_get_application_name ){
 		name = BASE_APPLICATION_GET_CLASS( application )->application_get_application_name( application );
 
 	} else {
@@ -485,7 +485,7 @@ base_application_get_icon_name( BaseApplication *application )
 
 	gchar *name = NULL;
 
-	if( BASE_APPLICATION_GET_CLASS( application )->application_get_icon_name( application )){
+	if( BASE_APPLICATION_GET_CLASS( application )->application_get_icon_name ){
 		name = BASE_APPLICATION_GET_CLASS( application )->application_get_icon_name( application );
 
 	} else {
@@ -515,7 +515,7 @@ base_application_get_unique_app_name( BaseApplication *application )
 
 	gchar *name = NULL;
 
-	if( BASE_APPLICATION_GET_CLASS( application )->application_get_unique_app_name( application )){
+	if( BASE_APPLICATION_GET_CLASS( application )->application_get_unique_app_name ){
 		name = BASE_APPLICATION_GET_CLASS( application )->application_get_unique_app_name( application );
 
 	} else {
@@ -546,7 +546,7 @@ base_application_get_ui_filename( BaseApplication *application )
 
 	gchar *name = NULL;
 
-	if( BASE_APPLICATION_GET_CLASS( application )->application_get_ui_filename( application )){
+	if( BASE_APPLICATION_GET_CLASS( application )->application_get_ui_filename ){
 		name = BASE_APPLICATION_GET_CLASS( application )->application_get_ui_filename( application );
 
 	} else {
@@ -579,7 +579,7 @@ base_application_get_main_window( BaseApplication *application )
 	g_assert( BASE_IS_APPLICATION( application ));
 
 	if( !application->private->main_window &&
-		BASE_APPLICATION_GET_CLASS( application )->application_get_main_window( application )){
+		BASE_APPLICATION_GET_CLASS( application )->application_get_main_window ){
 			application->private->main_window = BASE_WINDOW( BASE_APPLICATION_GET_CLASS( application )->application_get_main_window( application ));
 	}
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]