GNOME.org
 

[nautilus-actions] Rename base_window_get_toplevel() as base_window_get_gtk_toplevel()

commit 9a8c6e81dcac2437ffd3799bd96c5d52020cda9a
Author: Pierre Wieser <pwieser trychlos org>
Date:   Fri Jan 21 23:46:15 2011 +0100

    Rename base_window_get_toplevel() as base_window_get_gtk_toplevel()
    
    + src/nact/base-application.c:
    + src/nact/base-assistant.c:
    + src/nact/base-iprefs.c:
    + src/nact/nact-add-capability-dialog.c:
    + src/nact/nact-add-scheme-dialog.c:
    + src/nact/nact-assistant-export.c:
    + src/nact/nact-assistant-import.c:
    + src/nact/nact-confirm-logout.c:
    + src/nact/nact-export-ask.c:
    + src/nact/nact-gtk-utils.c:
    + src/nact/nact-icommand-tab.c:
    + src/nact/nact-icon-chooser.c:
    + src/nact/nact-ifolders-tab.c:
    + src/nact/nact-main-menubar.c:
    + src/nact/nact-main-window.c:
    + src/nact/nact-match-list.c:
    + src/nact/nact-preferences-editor.c:
    + src/nact/nact-tree-model-dnd.c: Updated accordingly.

 ChangeLog                             |   23 +++++++++++++++++++++++
 src/nact/base-application.c           |    2 +-
 src/nact/base-assistant.c             |    4 ++--
 src/nact/base-iprefs.c                |    4 ++--
 src/nact/base-window.c                |    8 ++++----
 src/nact/base-window.h                |    2 +-
 src/nact/nact-add-capability-dialog.c |    4 ++--
 src/nact/nact-add-scheme-dialog.c     |    4 ++--
 src/nact/nact-assistant-export.c      |    8 ++++----
 src/nact/nact-assistant-import.c      |    6 +++---
 src/nact/nact-confirm-logout.c        |    2 +-
 src/nact/nact-export-ask.c            |    4 ++--
 src/nact/nact-gtk-utils.c             |    4 ++--
 src/nact/nact-icommand-tab.c          |    2 +-
 src/nact/nact-icon-chooser.c          |    8 ++++----
 src/nact/nact-ifolders-tab.c          |    2 +-
 src/nact/nact-main-menubar.c          |    2 +-
 src/nact/nact-main-window.c           |    4 ++--
 src/nact/nact-match-list.c            |    2 +-
 src/nact/nact-preferences-editor.c    |    4 ++--
 src/nact/nact-tree-model-dnd.c        |    2 +-
 21 files changed, 62 insertions(+), 39 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 3e3881f..fcc20f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,29 @@
 2011-01-21 Pierre Wieser <pwieser trychlos org>
 
 	* src/nact/base-window.c:
+	* src/nact/base-window.h (base_window_get_toplevel):
+	Renamed as base_window_get_gtk_toplevel().
+
+	* src/nact/base-application.c:
+	* src/nact/base-assistant.c:
+	* src/nact/base-iprefs.c:
+	* src/nact/nact-add-capability-dialog.c:
+	* src/nact/nact-add-scheme-dialog.c:
+	* src/nact/nact-assistant-export.c:
+	* src/nact/nact-assistant-import.c:
+	* src/nact/nact-confirm-logout.c:
+	* src/nact/nact-export-ask.c:
+	* src/nact/nact-gtk-utils.c:
+	* src/nact/nact-icommand-tab.c:
+	* src/nact/nact-icon-chooser.c:
+	* src/nact/nact-ifolders-tab.c:
+	* src/nact/nact-main-menubar.c:
+	* src/nact/nact-main-window.c:
+	* src/nact/nact-match-list.c:
+	* src/nact/nact-preferences-editor.c:
+	* src/nact/nact-tree-model-dnd.c: Updated accordingly.
+
+	* src/nact/base-window.c:
 	* src/nact/base-window.h: Rename signal defines.
 
 	* src/nact/base-assistant.c:
diff --git a/src/nact/base-application.c b/src/nact/base-application.c
index 1fe7128..e3d62a3 100644
--- a/src/nact/base-application.c
+++ b/src/nact/base-application.c
@@ -460,7 +460,7 @@ base_application_run( BaseApplication *application )
 				g_return_val_if_fail( BASE_IS_WINDOW( application->private->main_window ), BASE_EXIT_CODE_START_FAIL );
 
 				if( base_window_init( application->private->main_window )){
-					gtk_toplevel = base_window_get_toplevel( application->private->main_window );
+					gtk_toplevel = base_window_get_gtk_toplevel( application->private->main_window );
 					g_return_val_if_fail( gtk_toplevel, BASE_EXIT_CODE_START_FAIL );
 					g_return_val_if_fail( GTK_IS_WINDOW( gtk_toplevel ), BASE_EXIT_CODE_START_FAIL );
 
diff --git a/src/nact/base-assistant.c b/src/nact/base-assistant.c
index 3676d37..25ee9fa 100644
--- a/src/nact/base-assistant.c
+++ b/src/nact/base-assistant.c
@@ -491,7 +491,7 @@ on_runtime_init( BaseAssistant *window, gpointer user_data )
 
 	if( !window->private->dispose_has_run ){
 
-		toplevel = base_window_get_toplevel( BASE_WINDOW( window ));
+		toplevel = base_window_get_gtk_toplevel( BASE_WINDOW( window ));
 		g_assert( GTK_IS_ASSISTANT( toplevel ));
 
 		base_window_signal_connect(
@@ -542,7 +542,7 @@ on_key_pressed_event( GtkWidget *widget, GdkEventKey *event, BaseAssistant *assi
 			assistant->private->cancel_on_escape ){
 
 				assistant->private->escape_key_pressed = TRUE;
-				toplevel = base_window_get_toplevel( BASE_WINDOW( assistant ));
+				toplevel = base_window_get_gtk_toplevel( BASE_WINDOW( assistant ));
 				g_signal_emit_by_name( toplevel, "cancel", toplevel );
 				stop = TRUE;
 		}
diff --git a/src/nact/base-iprefs.c b/src/nact/base-iprefs.c
index 668d070..89447c9 100644
--- a/src/nact/base-iprefs.c
+++ b/src/nact/base-iprefs.c
@@ -153,7 +153,7 @@ base_iprefs_position_window( const BaseWindow *window )
 
 		key = v_iprefs_get_window_id( window );
 		if( key ){
-			toplevel = base_window_get_toplevel( BASE_WINDOW( window ));
+			toplevel = base_window_get_gtk_toplevel( BASE_WINDOW( window ));
 			base_iprefs_position_named_window( window, toplevel, key );
 			g_free( key );
 		}
@@ -227,7 +227,7 @@ base_iprefs_save_window_position( const BaseWindow *window )
 
 		key = v_iprefs_get_window_id( window );
 		if( key ){
-			toplevel = base_window_get_toplevel( BASE_WINDOW( window ));
+			toplevel = base_window_get_gtk_toplevel( BASE_WINDOW( window ));
 			base_iprefs_save_named_window_position( window, toplevel, key );
 			g_free( key );
 		}
diff --git a/src/nact/base-window.c b/src/nact/base-window.c
index b951839..4caf2d4 100644
--- a/src/nact/base-window.c
+++ b/src/nact/base-window.c
@@ -835,7 +835,7 @@ base_window_get_parent( const BaseWindow *window )
 }
 
 /**
- * base_window_get_toplevel:
+ * base_window_get_gtk_toplevel:
  * @window: this #BaseWindow instance..
  *
  * Returns the top-level GtkWindow attached to this BaseWindow object.
@@ -844,7 +844,7 @@ base_window_get_parent( const BaseWindow *window )
  * #GtkWindow.
  */
 GtkWindow *
-base_window_get_toplevel( const BaseWindow *window )
+base_window_get_gtk_toplevel( const BaseWindow *window )
 {
 	GtkWindow *toplevel = NULL;
 
@@ -1127,7 +1127,7 @@ window_do_initial_load_toplevel( BaseWindow *window, gpointer user_data )
 		if( window->private->parent ){
 
 			g_assert( BASE_IS_WINDOW( window->private->parent ));
-			parent_toplevel = base_window_get_toplevel( BASE_WINDOW( window->private->parent ));
+			parent_toplevel = base_window_get_gtk_toplevel( BASE_WINDOW( window->private->parent ));
 			g_debug( "%s: toplevel=%p, parent_toplevel=%p", thisfn, ( void * ) window->private->gtk_toplevel, ( void * ) parent_toplevel );
 			gtk_window_set_transient_for( window->private->gtk_toplevel, parent_toplevel );
 		}
@@ -1362,7 +1362,7 @@ display_dlg( const BaseWindow *parent, GtkMessageType type_message, GtkButtonsTy
 
 	gtk_parent = NULL;
 	if( parent ){
-		gtk_parent = base_window_get_toplevel( parent );
+		gtk_parent = base_window_get_gtk_toplevel( parent );
 	}
 
 	dialog = gtk_message_dialog_new( gtk_parent, GTK_DIALOG_MODAL, type_message, type_buttons, "%s", primary );
diff --git a/src/nact/base-window.h b/src/nact/base-window.h
index 13d650b..e4774dd 100644
--- a/src/nact/base-window.h
+++ b/src/nact/base-window.h
@@ -235,7 +235,7 @@ int              base_window_run( BaseWindow *window );
 BaseApplication *base_window_get_application( const BaseWindow *window );
 GtkWindow       *base_window_get_named_toplevel( const BaseWindow *window, const gchar *name );
 BaseWindow      *base_window_get_parent( const BaseWindow *window );
-GtkWindow       *base_window_get_toplevel( const BaseWindow *window );
+GtkWindow       *base_window_get_gtk_toplevel( const BaseWindow *window );
 GtkWidget       *base_window_get_widget( const BaseWindow *window, const gchar *name );
 GtkWidget       *base_window_peek_widget( GtkWindow *window, const gchar *name );
 gboolean         base_window_is_willing_to_quit( const BaseWindow *window );
diff --git a/src/nact/nact-add-capability-dialog.c b/src/nact/nact-add-capability-dialog.c
index 0cabd18..1231b67 100644
--- a/src/nact/nact-add-capability-dialog.c
+++ b/src/nact/nact-add-capability-dialog.c
@@ -462,7 +462,7 @@ on_button_press_event( GtkWidget *widget, GdkEventButton *event, NactAddCapabili
 static void
 on_cancel_clicked( GtkButton *button, NactAddCapabilityDialog *dialog )
 {
-	GtkWindow *toplevel = base_window_get_toplevel( BASE_WINDOW( dialog ));
+	GtkWindow *toplevel = base_window_get_gtk_toplevel( BASE_WINDOW( dialog ));
 
 	gtk_dialog_response( GTK_DIALOG( toplevel ), GTK_RESPONSE_CLOSE );
 }
@@ -569,7 +569,7 @@ try_for_send_ok( NactAddCapabilityDialog *dialog )
 static void
 send_ok( NactAddCapabilityDialog *dialog )
 {
-	GtkWindow *toplevel = base_window_get_toplevel( BASE_WINDOW( dialog ));
+	GtkWindow *toplevel = base_window_get_gtk_toplevel( BASE_WINDOW( dialog ));
 
 	gtk_dialog_response( GTK_DIALOG( toplevel ), GTK_RESPONSE_OK );
 }
diff --git a/src/nact/nact-add-scheme-dialog.c b/src/nact/nact-add-scheme-dialog.c
index 32fbb71..d9c5fb6 100644
--- a/src/nact/nact-add-scheme-dialog.c
+++ b/src/nact/nact-add-scheme-dialog.c
@@ -376,7 +376,7 @@ on_button_press_event( GtkWidget *widget, GdkEventButton *event, NactAddSchemeDi
 static void
 on_cancel_clicked( GtkButton *button, NactAddSchemeDialog *dialog )
 {
-	GtkWindow *toplevel = base_window_get_toplevel( BASE_WINDOW( dialog ));
+	GtkWindow *toplevel = base_window_get_gtk_toplevel( BASE_WINDOW( dialog ));
 
 	gtk_dialog_response( GTK_DIALOG( toplevel ), GTK_RESPONSE_CLOSE );
 }
@@ -427,7 +427,7 @@ try_for_send_ok( NactAddSchemeDialog *dialog )
 static void
 send_ok( NactAddSchemeDialog *dialog )
 {
-	GtkWindow *toplevel = base_window_get_toplevel( BASE_WINDOW( dialog ));
+	GtkWindow *toplevel = base_window_get_gtk_toplevel( BASE_WINDOW( dialog ));
 
 	gtk_dialog_response( GTK_DIALOG( toplevel ), GTK_RESPONSE_OK );
 }
diff --git a/src/nact/nact-assistant-export.c b/src/nact/nact-assistant-export.c
index f55c589..44d5055 100644
--- a/src/nact/nact-assistant-export.c
+++ b/src/nact/nact-assistant-export.c
@@ -364,7 +364,7 @@ on_initial_load_dialog( NactAssistantExport *dialog, gpointer user_data )
 	are_locked = na_settings_get_boolean( settings, NA_IPREFS_ADMIN_PREFERENCES_LOCKED, NULL, &mandatory );
 	dialog->private->preferences_locked = are_locked && mandatory;
 
-	assistant = GTK_ASSISTANT( base_window_get_toplevel( BASE_WINDOW( dialog )));
+	assistant = GTK_ASSISTANT( base_window_get_gtk_toplevel( BASE_WINDOW( dialog )));
 
 	assist_initial_load_intro( dialog, assistant );
 	assist_initial_load_actions_list( dialog, assistant );
@@ -388,7 +388,7 @@ on_runtime_init_dialog( NactAssistantExport *dialog, gpointer user_data )
 	g_debug( "%s: dialog=%p, user_data=%p", thisfn, ( void * ) dialog, ( void * ) user_data );
 	g_assert( NACT_IS_ASSISTANT_EXPORT( dialog ));
 
-	assistant = GTK_ASSISTANT( base_window_get_toplevel( BASE_WINDOW( dialog )));
+	assistant = GTK_ASSISTANT( base_window_get_gtk_toplevel( BASE_WINDOW( dialog )));
 
 	base_window_signal_connect(
 			BASE_WINDOW( dialog ),
@@ -474,7 +474,7 @@ on_iactions_list_selection_changed( NactIActionsList *instance, GSList *selected
 	GtkWidget *content;
 
 	g_assert( NACT_IS_ASSISTANT_EXPORT( instance ));
-	assistant = GTK_ASSISTANT( base_window_get_toplevel( BASE_WINDOW( instance )));
+	assistant = GTK_ASSISTANT( base_window_get_gtk_toplevel( BASE_WINDOW( instance )));
 	pos = gtk_assistant_get_current_page( assistant );
 	if( pos == ASSIST_PAGE_ACTIONS_SELECTION ){
 
@@ -568,7 +568,7 @@ on_folder_selection_changed( GtkFileChooser *chooser, gpointer user_data )
 	g_assert( NACT_IS_ASSISTANT_EXPORT( user_data ));
 	assist = NACT_ASSISTANT_EXPORT( user_data );
 
-	assistant = GTK_ASSISTANT( base_window_get_toplevel( BASE_WINDOW( assist )));
+	assistant = GTK_ASSISTANT( base_window_get_gtk_toplevel( BASE_WINDOW( assist )));
 	pos = gtk_assistant_get_current_page( assistant );
 	if( pos == ASSIST_PAGE_FOLDER_SELECTION ){
 
diff --git a/src/nact/nact-assistant-import.c b/src/nact/nact-assistant-import.c
index 8634c59..39c98ac 100644
--- a/src/nact/nact-assistant-import.c
+++ b/src/nact/nact-assistant-import.c
@@ -317,7 +317,7 @@ on_runtime_init_dialog( NactAssistantImport *dialog, gpointer user_data )
 
 	if( !dialog->private->dispose_has_run ){
 
-		assistant = GTK_ASSISTANT( base_window_get_toplevel( BASE_WINDOW( dialog )));
+		assistant = GTK_ASSISTANT( base_window_get_gtk_toplevel( BASE_WINDOW( dialog )));
 
 		runtime_init_intro( dialog, assistant );
 		runtime_init_file_selector( dialog, assistant );
@@ -389,7 +389,7 @@ on_file_selection_changed( GtkFileChooser *chooser, gpointer user_data )
 	GtkWidget *content;
 
 	g_assert( NACT_IS_ASSISTANT_IMPORT( user_data ));
-	assistant = GTK_ASSISTANT( base_window_get_toplevel( BASE_WINDOW( user_data )));
+	assistant = GTK_ASSISTANT( base_window_get_gtk_toplevel( BASE_WINDOW( user_data )));
 	pos = gtk_assistant_get_current_page( assistant );
 	if( pos == ASSIST_PAGE_FILES_SELECTION ){
 
@@ -686,7 +686,7 @@ assistant_apply( BaseAssistant *wnd, GtkAssistant *assistant )
 	memset( &import_parms, '\0', sizeof( NAImporterParms ));
 
 	g_object_get( G_OBJECT( wnd ), BASE_PROP_PARENT, &main_window, NULL );
-	import_parms.parent = base_window_get_toplevel( main_window );
+	import_parms.parent = base_window_get_gtk_toplevel( main_window );
 
 	chooser = base_window_get_widget( BASE_WINDOW( window ), "ImportFileChooser" );
 	import_parms.uris = gtk_file_chooser_get_uris( GTK_FILE_CHOOSER( chooser ));
diff --git a/src/nact/nact-confirm-logout.c b/src/nact/nact-confirm-logout.c
index f76b671..a4f99d2 100644
--- a/src/nact/nact-confirm-logout.c
+++ b/src/nact/nact-confirm-logout.c
@@ -358,6 +358,6 @@ close_dialog( NactConfirmLogout *editor, gboolean willing_to )
 
 	editor->private->willing_to_quit = willing_to;
 
-	toplevel = base_window_get_toplevel( BASE_WINDOW( editor ));
+	toplevel = base_window_get_gtk_toplevel( BASE_WINDOW( editor ));
 	gtk_dialog_response( GTK_DIALOG( toplevel ), GTK_RESPONSE_CLOSE );
 }
diff --git a/src/nact/nact-export-ask.c b/src/nact/nact-export-ask.c
index ed86bae..7bd37a5 100644
--- a/src/nact/nact-export-ask.c
+++ b/src/nact/nact-export-ask.c
@@ -416,14 +416,14 @@ keep_choice_on_toggled( GtkToggleButton *button, NactExportAsk *editor )
 static void
 on_cancel_clicked( GtkButton *button, NactExportAsk *editor )
 {
-	GtkWindow *toplevel = base_window_get_toplevel( BASE_WINDOW( editor ));
+	GtkWindow *toplevel = base_window_get_gtk_toplevel( BASE_WINDOW( editor ));
 	gtk_dialog_response( GTK_DIALOG( toplevel ), GTK_RESPONSE_CLOSE );
 }
 
 static void
 on_ok_clicked( GtkButton *button, NactExportAsk *editor )
 {
-	GtkWindow *toplevel = base_window_get_toplevel( BASE_WINDOW( editor ));
+	GtkWindow *toplevel = base_window_get_gtk_toplevel( BASE_WINDOW( editor ));
 	gtk_dialog_response( GTK_DIALOG( toplevel ), GTK_RESPONSE_OK );
 }
 
diff --git a/src/nact/nact-gtk-utils.c b/src/nact/nact-gtk-utils.c
index 94b027a..408953d 100644
--- a/src/nact/nact-gtk-utils.c
+++ b/src/nact/nact-gtk-utils.c
@@ -450,7 +450,7 @@ nact_gtk_utils_select_file_with_preview( BaseWindow *window,
 	application = NACT_APPLICATION( base_window_get_application( window ));
 	updater = nact_application_get_updater( application );
 	settings = na_pivot_get_settings( NA_PIVOT( updater ));
-	toplevel = base_window_get_toplevel( window );
+	toplevel = base_window_get_gtk_toplevel( window );
 
 	dialog = gtk_file_chooser_dialog_new(
 			title,
@@ -532,7 +532,7 @@ nact_gtk_utils_select_dir( BaseWindow *window,
 	application = NACT_APPLICATION( base_window_get_application( window ));
 	updater = nact_application_get_updater( application );
 	settings = na_pivot_get_settings( NA_PIVOT( updater ));
-	toplevel = base_window_get_toplevel( window );
+	toplevel = base_window_get_gtk_toplevel( window );
 
 	dialog = gtk_file_chooser_dialog_new(
 			title,
diff --git a/src/nact/nact-icommand-tab.c b/src/nact/nact-icommand-tab.c
index a4798ba..af7fd71 100644
--- a/src/nact/nact-icommand-tab.c
+++ b/src/nact/nact-icommand-tab.c
@@ -487,7 +487,7 @@ legend_dialog_show( NactICommandTab *instance )
 	legend_dialog = get_legend_dialog( instance );
 	gtk_window_set_deletable( legend_dialog, FALSE );
 
-	toplevel = base_window_get_toplevel( BASE_WINDOW( instance ));
+	toplevel = base_window_get_gtk_toplevel( BASE_WINDOW( instance ));
 	gtk_window_set_transient_for( GTK_WINDOW( legend_dialog ), toplevel );
 
 	base_iprefs_position_named_window( BASE_WINDOW( instance ), legend_dialog, NA_IPREFS_COMMAND_LEGEND_WSP );
diff --git a/src/nact/nact-icon-chooser.c b/src/nact/nact-icon-chooser.c
index 4f62f1d..456bb17 100644
--- a/src/nact/nact-icon-chooser.c
+++ b/src/nact/nact-icon-chooser.c
@@ -364,7 +364,7 @@ on_base_initial_load_dialog( NactIconChooser *editor, gpointer user_data )
 	/* destroy event
 	 * there is here that we are going to release our stores
 	 */
-	GtkDialog *dialog = GTK_DIALOG( base_window_get_toplevel( BASE_WINDOW( editor )));
+	GtkDialog *dialog = GTK_DIALOG( base_window_get_gtk_toplevel( BASE_WINDOW( editor )));
 	g_signal_connect( G_OBJECT( dialog ), "destroy", G_CALLBACK( on_destroy ), NULL );
 }
 
@@ -477,7 +477,7 @@ on_base_runtime_init_dialog( NactIconChooser *editor, gpointer user_data )
 	 */
 	base_window_signal_connect(
 					BASE_WINDOW( editor ),
-					G_OBJECT( base_window_get_toplevel( BASE_WINDOW( editor ))),
+					G_OBJECT( base_window_get_gtk_toplevel( BASE_WINDOW( editor ))),
 					"key-press-event",
 					G_CALLBACK( on_key_pressed_event ));
 
@@ -573,14 +573,14 @@ on_base_all_widgets_showed( NactIconChooser *editor, gpointer user_data )
 static void
 on_cancel_clicked( GtkButton *button, NactIconChooser *editor )
 {
-	GtkWindow *toplevel = base_window_get_toplevel( BASE_WINDOW( editor ));
+	GtkWindow *toplevel = base_window_get_gtk_toplevel( BASE_WINDOW( editor ));
 	gtk_dialog_response( GTK_DIALOG( toplevel ), GTK_RESPONSE_CLOSE );
 }
 
 static void
 on_ok_clicked( GtkButton *button, NactIconChooser *editor )
 {
-	GtkWindow *toplevel = base_window_get_toplevel( BASE_WINDOW( editor ));
+	GtkWindow *toplevel = base_window_get_gtk_toplevel( BASE_WINDOW( editor ));
 	gtk_dialog_response( GTK_DIALOG( toplevel ), GTK_RESPONSE_OK );
 }
 
diff --git a/src/nact/nact-ifolders-tab.c b/src/nact/nact-ifolders-tab.c
index eb66f66..949c23d 100644
--- a/src/nact/nact-ifolders-tab.c
+++ b/src/nact/nact-ifolders-tab.c
@@ -274,7 +274,7 @@ on_browse_folder_clicked( GtkButton *button, BaseWindow *window )
 	NASettings *settings;
 
 	uri = NULL;
-	toplevel = base_window_get_toplevel( window );
+	toplevel = base_window_get_gtk_toplevel( window );
 
 	/* i18n: title of the FileChoose dialog when selecting an URI which
 	 * will be compare to Nautilus 'current_folder'
diff --git a/src/nact/nact-main-menubar.c b/src/nact/nact-main-menubar.c
index c7100fc..9b1039c 100644
--- a/src/nact/nact-main-menubar.c
+++ b/src/nact/nact-main-menubar.c
@@ -300,7 +300,7 @@ nact_main_menubar_runtime_init( NactMainWindow *window )
 		}
 	}
 
-	toplevel = base_window_get_toplevel( BASE_WINDOW( window ));
+	toplevel = base_window_get_gtk_toplevel( BASE_WINDOW( window ));
 	accel_group = gtk_ui_manager_get_accel_group( ui_manager );
 	gtk_window_add_accel_group( toplevel, accel_group );
 
diff --git a/src/nact/nact-main-window.c b/src/nact/nact-main-window.c
index e587094..8e771e4 100644
--- a/src/nact/nact-main-window.c
+++ b/src/nact/nact-main-window.c
@@ -1408,7 +1408,7 @@ setup_dialog_title( NactMainWindow *window )
 		title = tmp;
 	}
 
-	toplevel = base_window_get_toplevel( BASE_WINDOW( window ));
+	toplevel = base_window_get_gtk_toplevel( BASE_WINDOW( window ));
 	gtk_window_set_title( toplevel, title );
 	g_free( title );
 }
@@ -1675,5 +1675,5 @@ iabout_get_toplevel( NAIAbout *instance )
 	g_return_val_if_fail( NA_IS_IABOUT( instance ), NULL );
 	g_return_val_if_fail( BASE_IS_WINDOW( instance ), NULL );
 
-	return( base_window_get_toplevel( BASE_WINDOW( instance )));
+	return( base_window_get_gtk_toplevel( BASE_WINDOW( instance )));
 }
diff --git a/src/nact/nact-match-list.c b/src/nact/nact-match-list.c
index 237c376..56a26bb 100644
--- a/src/nact/nact-match-list.c
+++ b/src/nact/nact-match-list.c
@@ -489,7 +489,7 @@ on_filter_edited( GtkCellRendererText *renderer, const gchar *path_str, const gc
 
 	if( count_filters( text, data ) >= 1 ){
 		dialog = gtk_message_dialog_new(
-				base_window_get_toplevel( BASE_WINDOW( data->window )),
+				base_window_get_gtk_toplevel( BASE_WINDOW( data->window )),
 				GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
 				_( "'%s' filter already exists in the list.\nPlease provide another one." ), text );
 		gtk_dialog_run( GTK_DIALOG( dialog ));
diff --git a/src/nact/nact-preferences-editor.c b/src/nact/nact-preferences-editor.c
index e3cb92b..c289701 100644
--- a/src/nact/nact-preferences-editor.c
+++ b/src/nact/nact-preferences-editor.c
@@ -926,14 +926,14 @@ import_mode_on_toggled( NactPreferencesEditor *editor, GtkToggleButton *toggle_b
 static void
 on_cancel_clicked( GtkButton *button, NactPreferencesEditor *editor )
 {
-	GtkWindow *toplevel = base_window_get_toplevel( BASE_WINDOW( editor ));
+	GtkWindow *toplevel = base_window_get_gtk_toplevel( BASE_WINDOW( editor ));
 	gtk_dialog_response( GTK_DIALOG( toplevel ), GTK_RESPONSE_CLOSE );
 }
 
 static void
 on_ok_clicked( GtkButton *button, NactPreferencesEditor *editor )
 {
-	GtkWindow *toplevel = base_window_get_toplevel( BASE_WINDOW( editor ));
+	GtkWindow *toplevel = base_window_get_gtk_toplevel( BASE_WINDOW( editor ));
 	gtk_dialog_response( GTK_DIALOG( toplevel ), GTK_RESPONSE_OK );
 }
 
diff --git a/src/nact/nact-tree-model-dnd.c b/src/nact/nact-tree-model-dnd.c
index b945ba8..17133c7 100644
--- a/src/nact/nact-tree-model-dnd.c
+++ b/src/nact/nact-tree-model-dnd.c
@@ -897,7 +897,7 @@ drop_uri_list( NactTreeModel *model, GtkTreePath *dest, GtkSelectionData  *selec
 #endif
 	g_debug( "%s", selection_data_data );
 
-	parms.parent = base_window_get_toplevel( BASE_WINDOW( main_window ));
+	parms.parent = base_window_get_gtk_toplevel( BASE_WINDOW( main_window ));
 	parms.uris = g_slist_reverse( na_core_utils_slist_from_split( selection_data_data, "\r\n" ));
 
 	parms.mode = na_iprefs_get_import_mode( NA_PIVOT( updater ), NA_IPREFS_IMPORT_PREFERRED_MODE, NULL );
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]