GNOME.org
 

[nautilus-actions] Rename main window properties

commit 2c474bff5980535ad90969e61ebfad2032ffdd01
Author: Pierre Wieser <pwieser trychlos org>
Date:   Tue Jun 15 22:49:52 2010 +0200

    Rename main window properties

 ChangeLog                         |   14 ++++++++++++++
 src/nact/nact-iaction-tab.c       |   20 ++++++++++----------
 src/nact/nact-ibasenames-tab.c    |    2 +-
 src/nact/nact-icapabilities-tab.c |   10 +++++-----
 src/nact/nact-icommand-tab.c      |    4 ++--
 src/nact/nact-ienvironment-tab.c  |    4 ++--
 src/nact/nact-ifolders-tab.c      |    2 +-
 src/nact/nact-iproperties-tab.c   |    6 +++---
 src/nact/nact-ischemes-tab.c      |    4 ++--
 src/nact/nact-main-menubar-edit.c |    2 +-
 src/nact/nact-main-menubar-file.c |    2 +-
 src/nact/nact-main-tab.h          |    4 ++--
 src/nact/nact-main-window.c       |    2 +-
 src/nact/nact-match-list.c        |   14 +++++++-------
 14 files changed, 52 insertions(+), 38 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 943db23..42c80b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2010-06-15 Pierre Wieser <pwieser trychlos org>
 
+	* src/nact/nact-iaction-tab.c:
+	* src/nact/nact-ibasenames-tab.c:
+	* src/nact/nact-icapabilities-tab.c:
+	* src/nact/nact-icommand-tab.c:
+	* src/nact/nact-ienvironment-tab.c:
+	* src/nact/nact-ifolders-tab.c:
+	* src/nact/nact-iproperties-tab.c:
+	* src/nact/nact-ischemes-tab.c:
+	* src/nact/nact-main-menubar-edit.c:
+	* src/nact/nact-main-menubar-file.c:
+	* src/nact/nact-main-tab.h:
+	* src/nact/nact-main-window.c:
+	* src/nact/nact-match-list.c: Rename main properties.
+
 	* src/nact/nact-main-tab.h:
 	* src/nact/nact-main-window.c: Remove unused PROP_SELECTED_ROW property.
 
diff --git a/src/nact/nact-iaction-tab.c b/src/nact/nact-iaction-tab.c
index 68efe3e..6687a85 100644
--- a/src/nact/nact-iaction-tab.c
+++ b/src/nact/nact-iaction-tab.c
@@ -402,7 +402,7 @@ on_tab_updatable_selection_changed( NactIActionTab *instance, gint count_selecte
 
 		g_object_get(
 				G_OBJECT( instance ),
-				TAB_UPDATABLE_PROP_EDITED_ACTION, &item,
+				TAB_UPDATABLE_PROP_SELECTED_ITEM, &item,
 				TAB_UPDATABLE_PROP_EDITABLE, &editable,
 				NULL );
 
@@ -500,7 +500,7 @@ on_target_selection_toggled( GtkToggleButton *button, NactIActionTab *instance )
 
 		g_object_get(
 				G_OBJECT( instance ),
-				TAB_UPDATABLE_PROP_EDITED_ACTION, &action,
+				TAB_UPDATABLE_PROP_SELECTED_ITEM, &action,
 				TAB_UPDATABLE_PROP_EDITABLE, &editable,
 				NULL );
 
@@ -539,7 +539,7 @@ on_target_location_toggled( GtkToggleButton *button, NactIActionTab *instance )
 
 		g_object_get(
 				G_OBJECT( instance ),
-				TAB_UPDATABLE_PROP_EDITED_ACTION, &action,
+				TAB_UPDATABLE_PROP_SELECTED_ITEM, &action,
 				TAB_UPDATABLE_PROP_EDITABLE, &editable,
 				NULL );
 
@@ -583,7 +583,7 @@ check_for_label( NactIActionTab *instance, GtkEntry *entry, const gchar *label )
 
 		g_object_get(
 				G_OBJECT( instance ),
-				TAB_UPDATABLE_PROP_EDITED_ACTION, &edited,
+				TAB_UPDATABLE_PROP_SELECTED_ITEM, &edited,
 				NULL );
 
 		if( edited && g_utf8_strlen( label, -1 ) == 0 ){
@@ -607,7 +607,7 @@ on_label_changed( GtkEntry *entry, NactIActionTab *instance )
 
 	g_object_get(
 			G_OBJECT( instance ),
-			TAB_UPDATABLE_PROP_EDITED_ACTION, &edited,
+			TAB_UPDATABLE_PROP_SELECTED_ITEM, &edited,
 			NULL );
 
 	if( edited ){
@@ -647,7 +647,7 @@ on_target_toolbar_toggled( GtkToggleButton *button, NactIActionTab *instance )
 
 		g_object_get(
 				G_OBJECT( instance ),
-				TAB_UPDATABLE_PROP_EDITED_ACTION, &action,
+				TAB_UPDATABLE_PROP_SELECTED_ITEM, &action,
 				TAB_UPDATABLE_PROP_EDITABLE, &editable,
 				NULL );
 
@@ -686,7 +686,7 @@ on_toolbar_same_label_toggled( GtkToggleButton *button, NactIActionTab *instance
 
 		g_object_get(
 				G_OBJECT( instance ),
-				TAB_UPDATABLE_PROP_EDITED_ACTION, &edited,
+				TAB_UPDATABLE_PROP_SELECTED_ITEM, &edited,
 				TAB_UPDATABLE_PROP_EDITABLE, &editable,
 				NULL );
 
@@ -752,7 +752,7 @@ on_toolbar_label_changed( GtkEntry *entry, NactIActionTab *instance )
 
 	g_object_get(
 			G_OBJECT( instance ),
-			TAB_UPDATABLE_PROP_EDITED_ACTION, &edited,
+			TAB_UPDATABLE_PROP_SELECTED_ITEM, &edited,
 			NULL );
 
 	if( edited && NA_IS_OBJECT_ACTION( edited )){
@@ -784,7 +784,7 @@ on_tooltip_changed( GtkEntry *entry, NactIActionTab *instance )
 
 	g_object_get(
 			G_OBJECT( instance ),
-			TAB_UPDATABLE_PROP_EDITED_ACTION, &edited,
+			TAB_UPDATABLE_PROP_SELECTED_ITEM, &edited,
 			NULL );
 
 	if( edited ){
@@ -918,7 +918,7 @@ on_icon_changed( GtkEntry *icon_entry, NactIActionTab *instance )
 
 	g_object_get(
 			G_OBJECT( instance ),
-			TAB_UPDATABLE_PROP_EDITED_ACTION, &edited,
+			TAB_UPDATABLE_PROP_SELECTED_ITEM, &edited,
 			NULL );
 
 	if( edited ){
diff --git a/src/nact/nact-ibasenames-tab.c b/src/nact/nact-ibasenames-tab.c
index 4fd6825..6bd16e1 100644
--- a/src/nact/nact-ibasenames-tab.c
+++ b/src/nact/nact-ibasenames-tab.c
@@ -256,7 +256,7 @@ on_matchcase_toggled( GtkToggleButton *button, BaseWindow *window )
 
 		g_object_get(
 				G_OBJECT( window ),
-				TAB_UPDATABLE_PROP_EDITED_ACTION, &item,
+				TAB_UPDATABLE_PROP_SELECTED_ITEM, &item,
 				TAB_UPDATABLE_PROP_EDITED_PROFILE, &profile,
 				TAB_UPDATABLE_PROP_EDITABLE, &editable,
 				NULL );
diff --git a/src/nact/nact-icapabilities-tab.c b/src/nact/nact-icapabilities-tab.c
index 2f47ed5..d69772a 100644
--- a/src/nact/nact-icapabilities-tab.c
+++ b/src/nact/nact-icapabilities-tab.c
@@ -301,7 +301,7 @@ on_tab_updatable_selection_changed( NactICapabilitiesTab *instance, gint count_s
 
 		g_object_get(
 				G_OBJECT( instance ),
-				TAB_UPDATABLE_PROP_EDITED_ACTION, &item,
+				TAB_UPDATABLE_PROP_SELECTED_ITEM, &item,
 				TAB_UPDATABLE_PROP_EDITED_PROFILE, &profile,
 				TAB_UPDATABLE_PROP_EDITABLE, &editable,
 				NULL );
@@ -354,7 +354,7 @@ on_selcount_ope_changed( GtkComboBox *combo, NactICapabilitiesTab *instance )
 
 	g_object_get(
 			G_OBJECT( instance ),
-			TAB_UPDATABLE_PROP_EDITED_ACTION, &edited,
+			TAB_UPDATABLE_PROP_SELECTED_ITEM, &edited,
 			TAB_UPDATABLE_PROP_EDITED_PROFILE, &profile,
 			TAB_UPDATABLE_PROP_EDITABLE, &editable,
 			NULL );
@@ -380,7 +380,7 @@ on_selcount_int_changed( GtkEntry *entry, NactICapabilitiesTab *instance )
 
 	g_object_get(
 			G_OBJECT( instance ),
-			TAB_UPDATABLE_PROP_EDITED_ACTION, &edited,
+			TAB_UPDATABLE_PROP_SELECTED_ITEM, &edited,
 			TAB_UPDATABLE_PROP_EDITED_PROFILE, &profile,
 			TAB_UPDATABLE_PROP_EDITABLE, &editable,
 			NULL );
@@ -406,7 +406,7 @@ on_add_clicked( GtkButton *button, BaseWindow *window )
 
 	g_object_get(
 			G_OBJECT( window ),
-			TAB_UPDATABLE_PROP_EDITED_ACTION, &item,
+			TAB_UPDATABLE_PROP_SELECTED_ITEM, &item,
 			TAB_UPDATABLE_PROP_EDITED_PROFILE, &profile,
 			NULL );
 
@@ -433,7 +433,7 @@ tab_set_sensitive( NactICapabilitiesTab *instance )
 
 	g_object_get(
 			G_OBJECT( instance ),
-			TAB_UPDATABLE_PROP_EDITED_ACTION, &item,
+			TAB_UPDATABLE_PROP_SELECTED_ITEM, &item,
 			TAB_UPDATABLE_PROP_EDITED_PROFILE, &profile,
 			NULL );
 
diff --git a/src/nact/nact-icommand-tab.c b/src/nact/nact-icommand-tab.c
index 2de8845..0bbc784 100644
--- a/src/nact/nact-icommand-tab.c
+++ b/src/nact/nact-icommand-tab.c
@@ -349,7 +349,7 @@ on_tab_updatable_selection_changed( NactICommandTab *instance, gint count_select
 
 		g_object_get(
 				G_OBJECT( instance ),
-				TAB_UPDATABLE_PROP_EDITED_ACTION, &item,
+				TAB_UPDATABLE_PROP_SELECTED_ITEM, &item,
 				TAB_UPDATABLE_PROP_EDITED_PROFILE, &profile,
 				TAB_UPDATABLE_PROP_EDITABLE, &editable,
 				NULL );
@@ -804,7 +804,7 @@ parse_parameters( NactICommandTab *instance )
 
 	g_object_get(
 			G_OBJECT( instance ),
-			TAB_UPDATABLE_PROP_EDITED_ACTION, &item,
+			TAB_UPDATABLE_PROP_SELECTED_ITEM, &item,
 			TAB_UPDATABLE_PROP_EDITED_PROFILE, &profile,
 			NULL );
 
diff --git a/src/nact/nact-ienvironment-tab.c b/src/nact/nact-ienvironment-tab.c
index c203086..96c8ca1 100644
--- a/src/nact/nact-ienvironment-tab.c
+++ b/src/nact/nact-ienvironment-tab.c
@@ -422,7 +422,7 @@ on_tab_updatable_selection_changed( NactIEnvironmentTab *instance, gint count_se
 		 */
 		g_object_get(
 				G_OBJECT( instance ),
-				TAB_UPDATABLE_PROP_EDITED_ACTION, &item,
+				TAB_UPDATABLE_PROP_SELECTED_ITEM, &item,
 				TAB_UPDATABLE_PROP_EDITED_PROFILE, &profile,
 				TAB_UPDATABLE_PROP_EDITABLE, &editable,
 				NULL );
@@ -573,7 +573,7 @@ on_desktop_toggled( GtkCellRendererToggle *renderer, gchar *path, BaseWindow *wi
 
 		g_object_get(
 				G_OBJECT( window ),
-				TAB_UPDATABLE_PROP_EDITED_ACTION, &item,
+				TAB_UPDATABLE_PROP_SELECTED_ITEM, &item,
 				TAB_UPDATABLE_PROP_EDITED_PROFILE, &profile,
 				TAB_UPDATABLE_PROP_EDITABLE, &editable,
 				NULL );
diff --git a/src/nact/nact-ifolders-tab.c b/src/nact/nact-ifolders-tab.c
index 31cf815..a4758d7 100644
--- a/src/nact/nact-ifolders-tab.c
+++ b/src/nact/nact-ifolders-tab.c
@@ -318,7 +318,7 @@ on_tab_updatable_selection_changed( NactIFoldersTab *instance, gint count_select
 
 	g_object_get(
 			G_OBJECT( instance ),
-			TAB_UPDATABLE_PROP_EDITED_ACTION, &item,
+			TAB_UPDATABLE_PROP_SELECTED_ITEM, &item,
 			TAB_UPDATABLE_PROP_EDITED_PROFILE, &profile,
 			TAB_UPDATABLE_PROP_EDITABLE, &editable,
 			NULL );
diff --git a/src/nact/nact-iproperties-tab.c b/src/nact/nact-iproperties-tab.c
index f31d3fe..20db304 100644
--- a/src/nact/nact-iproperties-tab.c
+++ b/src/nact/nact-iproperties-tab.c
@@ -247,7 +247,7 @@ on_tab_updatable_selection_changed( NactIPropertiesTab *instance, gint count_sel
 
 		g_object_get(
 				G_OBJECT( instance ),
-				TAB_UPDATABLE_PROP_EDITED_ACTION, &item,
+				TAB_UPDATABLE_PROP_SELECTED_ITEM, &item,
 				TAB_UPDATABLE_PROP_EDITABLE, &editable,
 				NULL );
 
@@ -335,7 +335,7 @@ on_enabled_toggled( GtkToggleButton *button, NactIPropertiesTab *instance )
 
 		g_object_get(
 				G_OBJECT( instance ),
-				TAB_UPDATABLE_PROP_EDITED_ACTION, &edited,
+				TAB_UPDATABLE_PROP_SELECTED_ITEM, &edited,
 				TAB_UPDATABLE_PROP_EDITABLE, &editable,
 				NULL );
 
@@ -382,7 +382,7 @@ on_description_changed( GtkTextBuffer *buffer, NactIPropertiesTab *instance )
 
 	g_object_get(
 			G_OBJECT( instance ),
-			TAB_UPDATABLE_PROP_EDITED_ACTION, &edited,
+			TAB_UPDATABLE_PROP_SELECTED_ITEM, &edited,
 			NULL );
 
 	if( edited ){
diff --git a/src/nact/nact-ischemes-tab.c b/src/nact/nact-ischemes-tab.c
index ab9e56d..48176f5 100644
--- a/src/nact/nact-ischemes-tab.c
+++ b/src/nact/nact-ischemes-tab.c
@@ -234,7 +234,7 @@ on_add_from_defaults( GtkButton *button, BaseWindow *window )
 
 	g_object_get(
 			G_OBJECT( window ),
-			TAB_UPDATABLE_PROP_EDITED_ACTION, &item,
+			TAB_UPDATABLE_PROP_SELECTED_ITEM, &item,
 			TAB_UPDATABLE_PROP_EDITED_PROFILE, &profile,
 			NULL );
 
@@ -263,7 +263,7 @@ on_tab_updatable_selection_changed( BaseWindow *window, gint count_selected )
 
 	g_object_get(
 			G_OBJECT( window ),
-			TAB_UPDATABLE_PROP_EDITED_ACTION, &item,
+			TAB_UPDATABLE_PROP_SELECTED_ITEM, &item,
 			TAB_UPDATABLE_PROP_EDITED_PROFILE, &profile,
 			TAB_UPDATABLE_PROP_EDITABLE, &editable,
 			NULL );
diff --git a/src/nact/nact-main-menubar-edit.c b/src/nact/nact-main-menubar-edit.c
index 05b0788..d2b4b99 100644
--- a/src/nact/nact-main-menubar-edit.c
+++ b/src/nact/nact-main-menubar-edit.c
@@ -375,7 +375,7 @@ prepare_for_paste( NactMainWindow *window )
 
 		if( NA_IS_OBJECT_PROFILE( it->data )){
 			if( !action ){
-				g_object_get( G_OBJECT( window ), TAB_UPDATABLE_PROP_EDITED_ACTION, &action, NULL );
+				g_object_get( G_OBJECT( window ), TAB_UPDATABLE_PROP_SELECTED_ITEM, &action, NULL );
 				g_return_val_if_fail( NA_IS_OBJECT_ACTION( action ), NULL );
 			}
 		}
diff --git a/src/nact/nact-main-menubar-file.c b/src/nact/nact-main-menubar-file.c
index 9c59382..42245ac 100644
--- a/src/nact/nact-main-menubar-file.c
+++ b/src/nact/nact-main-menubar-file.c
@@ -193,7 +193,7 @@ nact_main_menubar_file_on_new_profile( GtkAction *gtk_action, NactMainWindow *wi
 
 	g_object_get(
 			G_OBJECT( window ),
-			TAB_UPDATABLE_PROP_EDITED_ACTION, &action,
+			TAB_UPDATABLE_PROP_SELECTED_ITEM, &action,
 			NULL );
 
 	profile = na_object_profile_new_with_defaults();
diff --git a/src/nact/nact-main-tab.h b/src/nact/nact-main-tab.h
index 3d7610b..af933df 100644
--- a/src/nact/nact-main-tab.h
+++ b/src/nact/nact-main-tab.h
@@ -43,8 +43,8 @@
 
 /* properties set against the GObject instance
  */
-#define TAB_UPDATABLE_PROP_EDITED_ACTION				"nact-tab-updatable-edited-action"
-#define TAB_UPDATABLE_PROP_EDITED_PROFILE				"nact-tab-updatable-edited-profile"
+#define TAB_UPDATABLE_PROP_SELECTED_ITEM				"nact-tab-updatable-selected-item"
+#define TAB_UPDATABLE_PROP_EDITED_PROFILE				"nact-tab-updatable-selected-profile"
 #define TAB_UPDATABLE_PROP_EDITABLE						"nact-tab-updatable-editable"
 #define TAB_UPDATABLE_PROP_REASON						"nact-tab-updatable-reason"
 
diff --git a/src/nact/nact-main-window.c b/src/nact/nact-main-window.c
index b99521c..f3748c4 100644
--- a/src/nact/nact-main-window.c
+++ b/src/nact/nact-main-window.c
@@ -356,7 +356,7 @@ class_init( NactMainWindowClass *klass )
 	object_class->get_property = instance_get_property;
 
 	spec = g_param_spec_pointer(
-			TAB_UPDATABLE_PROP_EDITED_ACTION,
+			TAB_UPDATABLE_PROP_SELECTED_ITEM,
 			"Edited NAObjectItem",
 			"A pointer to the edited NAObjectItem, an action or a menu",
 			G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE );
diff --git a/src/nact/nact-match-list.c b/src/nact/nact-match-list.c
index ad6d5a1..85f654a 100644
--- a/src/nact/nact-match-list.c
+++ b/src/nact/nact-match-list.c
@@ -324,7 +324,7 @@ nact_match_list_on_selection_changed( BaseWindow *window, const gchar *tab_name,
 
 	g_object_get(
 			G_OBJECT( window ),
-			TAB_UPDATABLE_PROP_EDITED_ACTION, &item,
+			TAB_UPDATABLE_PROP_SELECTED_ITEM, &item,
 			TAB_UPDATABLE_PROP_EDITED_PROFILE, &profile,
 			TAB_UPDATABLE_PROP_EDITABLE, &editable,
 			NULL );
@@ -475,7 +475,7 @@ on_filter_edited( GtkCellRendererText *renderer, const gchar *path_str, const gc
 
 	g_object_get(
 			G_OBJECT( data->window ),
-			TAB_UPDATABLE_PROP_EDITED_ACTION, &item,
+			TAB_UPDATABLE_PROP_SELECTED_ITEM, &item,
 			TAB_UPDATABLE_PROP_EDITED_PROFILE, &profile,
 			NULL );
 
@@ -578,7 +578,7 @@ on_must_match_toggled( GtkCellRendererToggle *cell_renderer, gchar *path_str, Ma
 
 		g_object_get(
 				G_OBJECT( data->window ),
-				TAB_UPDATABLE_PROP_EDITED_ACTION, &item,
+				TAB_UPDATABLE_PROP_SELECTED_ITEM, &item,
 				TAB_UPDATABLE_PROP_EDITED_PROFILE, &profile,
 				NULL );
 
@@ -635,7 +635,7 @@ on_must_not_match_toggled( GtkCellRendererToggle *cell_renderer, gchar *path_str
 
 		g_object_get(
 				G_OBJECT( data->window ),
-				TAB_UPDATABLE_PROP_EDITED_ACTION, &item,
+				TAB_UPDATABLE_PROP_SELECTED_ITEM, &item,
 				TAB_UPDATABLE_PROP_EDITED_PROFILE, &profile,
 				NULL );
 
@@ -682,7 +682,7 @@ add_filter( MatchListStr *data, const gchar *filter, const gchar *prefix )
 
 	g_object_get(
 			G_OBJECT( data->window ),
-			TAB_UPDATABLE_PROP_EDITED_ACTION, &item,
+			TAB_UPDATABLE_PROP_SELECTED_ITEM, &item,
 			TAB_UPDATABLE_PROP_EDITED_PROFILE, &profile,
 			NULL );
 
@@ -726,7 +726,7 @@ delete_current_row( MatchListStr *data )
 
 		g_object_get(
 				G_OBJECT( data->window ),
-				TAB_UPDATABLE_PROP_EDITED_ACTION, &item,
+				TAB_UPDATABLE_PROP_SELECTED_ITEM, &item,
 				TAB_UPDATABLE_PROP_EDITED_PROFILE, &profile,
 				NULL );
 
@@ -899,7 +899,7 @@ tab_set_sensitive( MatchListStr *data )
 
 	g_object_get(
 			G_OBJECT( data->window ),
-			TAB_UPDATABLE_PROP_EDITED_ACTION, &item,
+			TAB_UPDATABLE_PROP_SELECTED_ITEM, &item,
 			TAB_UPDATABLE_PROP_EDITED_PROFILE, &profile,
 			NULL );
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]