[nautilus-actions] Fix compilation errors
- From: Pierre Wieser <pwieser src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus-actions] Fix compilation errors
- Date: Mon, 24 Jan 2011 19:41:42 +0000 (UTC)
commit dc489518416d6053980487e465b01bb7fca9c7cf
Author: Pierre Wieser <pwieser trychlos org>
Date: Mon Jan 24 05:24:49 2011 +0100
Fix compilation errors
+ src/nact/base-window.c (base_window_is_willing_to_quit)
+ src/nact/nact-main-window.c (base_is_willing_to_quit).
src/nact/base-window.c | 1 -
src/nact/nact-main-window.c | 10 ++++++----
2 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/src/nact/base-window.c b/src/nact/base-window.c
index 7b46676..38c9891 100644
--- a/src/nact/base-window.c
+++ b/src/nact/base-window.c
@@ -997,7 +997,6 @@ gboolean
base_window_is_willing_to_quit( const BaseWindow *window )
{
gboolean willing_to;
- GObjectClass *class;
willing_to = TRUE;
diff --git a/src/nact/nact-main-window.c b/src/nact/nact-main-window.c
index c069473..49817b6 100644
--- a/src/nact/nact-main-window.c
+++ b/src/nact/nact-main-window.c
@@ -1113,8 +1113,10 @@ base_is_willing_to_quit( const BaseWindow *window )
}
/* call parent class */
- if( willing_to && BASE_APPLICATION_CLASS( st_parent_class )->is_willing_to_quit ){
- willing_to = BASE_APPLICATION_CLASS( st_parent_class )->is_willing_to_quit( window );
+ if( willing_to ){
+ if( BASE_WINDOW_CLASS( st_parent_class )->is_willing_to_quit ){
+ willing_to = BASE_WINDOW_CLASS( st_parent_class )->is_willing_to_quit( window );
+ }
}
return( willing_to );
@@ -1172,8 +1174,8 @@ on_base_initialize_gtk_toplevel( BaseWindow *window, GtkWindow *toplevel )
nact_main_statusbar_initial_load_toplevel( main_window );
/* call parent class */
- if( ret && BASE_APPLICATION_CLASS( st_parent_class )->initialize_gtk_toplevel ){
- ret = BASE_APPLICATION_CLASS( st_parent_class )->initialize_gtk_toplevel( window, toplevel );
+ if( BASE_WINDOW_CLASS( st_parent_class )->initialize_gtk_toplevel ){
+ BASE_WINDOW_CLASS( st_parent_class )->initialize_gtk_toplevel( window, toplevel );
}
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]