[nautilus-actions] na_iprefs is renamed to fma_iprefs
- From: Pierre Wieser <pwieser src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus-actions] na_iprefs is renamed to fma_iprefs
- Date: Wed, 15 Feb 2017 22:47:51 +0000 (UTC)
commit 4818ec9e02846851cd6968619d825e324f2d61c8
Author: Pierre Wieser <pwieser trychlos org>
Date: Tue Sep 8 11:52:23 2015 +0200
na_iprefs is renamed to fma_iprefs
src/core/Makefile.am | 4 ++--
src/core/fma-io-provider.c | 6 +++---
src/core/{na-iprefs.c => fma-iprefs.c} | 30 +++++++++++++++---------------
src/core/{na-iprefs.h => fma-iprefs.h} | 18 +++++++++---------
src/nact/nact-main-window.c | 6 +++---
src/nact/nact-menu-file.c | 4 ++--
src/nact/nact-menu-view.c | 6 +++---
src/nact/nact-preferences-editor.c | 6 +++---
src/nact/nact-sort-buttons.c | 8 ++++----
src/nact/nact-tree-model.c | 6 +++---
10 files changed, 47 insertions(+), 47 deletions(-)
---
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 2512fb4..829af15 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -96,8 +96,8 @@ libna_core_la_SOURCES = \
fma-ioption.h \
fma-ioptions-list.c \
fma-ioptions-list.h \
- na-iprefs.c \
- na-iprefs.h \
+ fma-iprefs.c \
+ fma-iprefs.h \
na-module.c \
na-module.h \
fma-object.c \
diff --git a/src/core/fma-io-provider.c b/src/core/fma-io-provider.c
index e9bb089..09838d9 100644
--- a/src/core/fma-io-provider.c
+++ b/src/core/fma-io-provider.c
@@ -38,7 +38,7 @@
#include <api/fma-object-api.h>
#include <api/fma-core-utils.h>
-#include "na-iprefs.h"
+#include "fma-iprefs.h"
#include "fma-io-provider.h"
/* private class data
@@ -880,7 +880,7 @@ fma_io_provider_load_items( const NAPivot *pivot, guint loadable_set, GSList **m
if( flat || !level_zero || !g_slist_length( level_zero )){
g_debug( "%s: rewriting level-zero", thisfn );
- if( !na_iprefs_write_level_zero( hierarchy, messages )){
+ if( !fma_iprefs_write_level_zero( hierarchy, messages )){
g_warning( "%s: unable to update level-zero", thisfn );
}
}
@@ -889,7 +889,7 @@ fma_io_provider_load_items( const NAPivot *pivot, guint loadable_set, GSList **m
/* sort the hierarchy according to preferences
*/
- order_mode = na_iprefs_get_order_mode( NULL );
+ order_mode = fma_iprefs_get_order_mode( NULL );
switch( order_mode ){
case IPREFS_ORDER_ALPHA_ASCENDING:
hierarchy = load_items_hierarchy_sort( pivot, hierarchy, ( GCompareFunc )
fma_object_id_sort_alpha_asc );
diff --git a/src/core/na-iprefs.c b/src/core/fma-iprefs.c
similarity index 89%
rename from src/core/na-iprefs.c
rename to src/core/fma-iprefs.c
index 72836ee..48a6c64 100644
--- a/src/core/na-iprefs.c
+++ b/src/core/fma-iprefs.c
@@ -36,7 +36,7 @@
#include <api/fma-core-utils.h>
#include "fma-importer.h"
-#include "na-iprefs.h"
+#include "fma-iprefs.h"
#include "na-settings.h"
typedef struct {
@@ -46,7 +46,7 @@ typedef struct {
EnumMap;
/* sort mode of the items in the file manager context menu
- * enum is defined in core/na-iprefs.h
+ * enum is defined in core/fma-iprefs.h
*/
#define ORDER_ALPHA_ASC_STR "AscendingOrder"
#define ORDER_ALPHA_DESC_STR "DescendingOrder"
@@ -71,14 +71,14 @@ static const gchar *enum_map_string_from_id( const EnumMap *map, guint id );
static guint enum_map_id_from_string( const EnumMap *map, const gchar *str );
/*
- * na_iprefs_get_order_mode:
+ * fma_iprefs_get_order_mode:
* @mandatory: if not %NULL, a pointer to a boolean which will receive the
* mandatory property.
*
* Returns: the order mode currently set.
*/
guint
-na_iprefs_get_order_mode( gboolean *mandatory )
+fma_iprefs_get_order_mode( gboolean *mandatory )
{
gchar *order_mode_str;
guint order_mode;
@@ -91,7 +91,7 @@ na_iprefs_get_order_mode( gboolean *mandatory )
}
/*
- * na_iprefs_get_order_mode_by_label:
+ * fma_iprefs_get_order_mode_by_label:
* @label: the label.
*
* This function converts a label (e.g. 'ManualOrder') stored in user preferences
@@ -101,7 +101,7 @@ na_iprefs_get_order_mode( gboolean *mandatory )
* Returns: the order mode currently set.
*/
guint
-na_iprefs_get_order_mode_by_label( const gchar *label )
+fma_iprefs_get_order_mode_by_label( const gchar *label )
{
guint order_mode;
@@ -111,14 +111,14 @@ na_iprefs_get_order_mode_by_label( const gchar *label )
}
/*
- * na_iprefs_set_order_mode:
+ * fma_iprefs_set_order_mode:
* @mode: the new value to be written.
*
* Writes the current status of 'alphabetical order' to the GConf
* preference system.
*/
void
-na_iprefs_set_order_mode( guint mode )
+fma_iprefs_set_order_mode( guint mode )
{
const gchar *order_str;
@@ -127,14 +127,14 @@ na_iprefs_set_order_mode( guint mode )
}
/*
- * na_iprefs_get_tabs_pos:
+ * fma_iprefs_get_tabs_pos:
* @mandatory: if not %NULL, a pointer to a boolean which will receive the
* mandatory property.
*
* Returns: the tabs position of the main window.
*/
guint
-na_iprefs_get_tabs_pos( gboolean *mandatory )
+fma_iprefs_get_tabs_pos( gboolean *mandatory )
{
gchar *tabs_pos_str;
guint tabs_pos;
@@ -147,13 +147,13 @@ na_iprefs_get_tabs_pos( gboolean *mandatory )
}
/*
- * na_iprefs_set_tabs_pos:
+ * fma_iprefs_set_tabs_pos:
* @position: the new value to be written.
*
* Writes the current status of 'tabs position' to the preference system.
*/
void
-na_iprefs_set_tabs_pos( guint position )
+fma_iprefs_set_tabs_pos( guint position )
{
const gchar *tabs_pos_str;
@@ -162,7 +162,7 @@ na_iprefs_set_tabs_pos( guint position )
}
/*
- * na_iprefs_write_level_zero:
+ * fma_iprefs_write_level_zero:
* @items: the #GList of items whose first level is to be written.
* @messages: a pointer to a #GSList in which we will add happening
* error messages;
@@ -176,12 +176,12 @@ na_iprefs_set_tabs_pos( guint position )
* and so on), %FALSE else.
*
* @messages #GSList is only filled up in case of an error has occured.
- * If there is no error (na_iprefs_write_level_zero() returns %TRUE), then
+ * If there is no error (fma_iprefs_write_level_zero() returns %TRUE), then
* the caller may safely assume that @messages is returned in the same
* state that it has been provided.
*/
gboolean
-na_iprefs_write_level_zero( const GList *items, GSList **messages )
+fma_iprefs_write_level_zero( const GList *items, GSList **messages )
{
gboolean written;
const GList *it;
diff --git a/src/core/na-iprefs.h b/src/core/fma-iprefs.h
similarity index 77%
rename from src/core/na-iprefs.h
rename to src/core/fma-iprefs.h
index 68c3be7..995ff0b 100644
--- a/src/core/na-iprefs.h
+++ b/src/core/fma-iprefs.h
@@ -27,8 +27,8 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __CORE_NA_IPREFS_H__
-#define __CORE_NA_IPREFS_H__
+#ifndef __CORE_FMA_IPREFS_H__
+#define __CORE_FMA_IPREFS_H__
/*
* Starting with 3.1.0, NAIPrefs interface is deprecated.
@@ -51,15 +51,15 @@ enum {
IPREFS_ORDER_MANUAL
};
-guint na_iprefs_get_order_mode ( gboolean *mandatory );
-guint na_iprefs_get_order_mode_by_label( const gchar *label );
-void na_iprefs_set_order_mode ( guint mode );
+guint fma_iprefs_get_order_mode ( gboolean *mandatory );
+guint fma_iprefs_get_order_mode_by_label( const gchar *label );
+void fma_iprefs_set_order_mode ( guint mode );
-guint na_iprefs_get_tabs_pos ( gboolean *mandatory );
-void na_iprefs_set_tabs_pos ( guint pos );
+guint fma_iprefs_get_tabs_pos ( gboolean *mandatory );
+void fma_iprefs_set_tabs_pos ( guint pos );
-gboolean na_iprefs_write_level_zero ( const GList *items, GSList **messages );
+gboolean fma_iprefs_write_level_zero ( const GList *items, GSList **messages );
G_END_DECLS
-#endif /* __CORE_NA_IPREFS_H__ */
+#endif /* __CORE_FMA_IPREFS_H__ */
diff --git a/src/nact/nact-main-window.c b/src/nact/nact-main-window.c
index 07a09a7..1aef497 100644
--- a/src/nact/nact-main-window.c
+++ b/src/nact/nact-main-window.c
@@ -39,7 +39,7 @@
#include "core/fma-about.h"
#include "core/fma-gtk-utils.h"
-#include "core/na-iprefs.h"
+#include "core/fma-iprefs.h"
#include "core/na-pivot.h"
#include "nact-iaction-tab.h"
@@ -620,7 +620,7 @@ instance_dispose( GObject *window )
notebook = GTK_NOTEBOOK( fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( window ),
"main-notebook" ));
pos = gtk_notebook_get_tab_pos( notebook );
- na_iprefs_set_tabs_pos( pos );
+ fma_iprefs_set_tabs_pos( pos );
fma_gtk_utils_save_window_position( GTK_WINDOW( window ), st_wsp_name );
}
@@ -731,7 +731,7 @@ setup_main_ui( NactMainWindow *main_window )
*/
notebook = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( top_widget ), "main-notebook" );
g_return_if_fail( notebook && GTK_IS_NOTEBOOK( notebook ));
- pos = na_iprefs_get_tabs_pos( NULL );
+ pos = fma_iprefs_get_tabs_pos( NULL );
gtk_notebook_set_tab_pos( GTK_NOTEBOOK( notebook ), pos );
gtk_notebook_popup_enable( GTK_NOTEBOOK( notebook ));
diff --git a/src/nact/nact-menu-file.c b/src/nact/nact-menu-file.c
index 2b6bc6e..b8d866a 100644
--- a/src/nact/nact-menu-file.c
+++ b/src/nact/nact-menu-file.c
@@ -38,7 +38,7 @@
#include <api/fma-timeout.h>
#include <core/fma-io-provider.h>
-#include <core/na-iprefs.h>
+#include <core/fma-iprefs.h>
#include "nact-application.h"
#include "nact-statusbar.h"
@@ -250,7 +250,7 @@ nact_menu_file_save_items( NactMainWindow *window )
messages = NULL;
if( nact_tree_ieditable_is_level_zero_modified( NACT_TREE_IEDITABLE( items_view ))){
- if( !na_iprefs_write_level_zero( items, &messages )){
+ if( !fma_iprefs_write_level_zero( items, &messages )){
if( g_slist_length( messages )){
msg = fma_core_utils_slist_join_at_end( messages, "\n" );
} else {
diff --git a/src/nact/nact-menu-view.c b/src/nact/nact-menu-view.c
index 6d28f8c..436faf9 100644
--- a/src/nact/nact-menu-view.c
+++ b/src/nact/nact-menu-view.c
@@ -32,7 +32,7 @@
#endif
#include "core/fma-gtk-utils.h"
-#include "core/na-iprefs.h"
+#include "core/fma-iprefs.h"
#include "nact-main-window.h"
#include "nact-menu.h"
@@ -283,7 +283,7 @@ setup_notebook_tab_position_submenu( NactMainWindow *window )
sNotebookTabsProps *props;
GAction *action;
- pos = na_iprefs_get_tabs_pos( NULL );
+ pos = fma_iprefs_get_tabs_pos( NULL );
props = get_notebook_tabs_properties_by_pos( pos );
g_return_if_fail( props );
@@ -379,5 +379,5 @@ set_notebook_tabs_position( NactMainWindow *main_window, guint pos )
notebook = GTK_NOTEBOOK( fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( main_window ),
"main-notebook" ));
gtk_notebook_set_tab_pos( notebook, pos );
- na_iprefs_set_tabs_pos( pos );
+ fma_iprefs_set_tabs_pos( pos );
}
diff --git a/src/nact/nact-preferences-editor.c b/src/nact/nact-preferences-editor.c
index c3053d2..b37b095 100644
--- a/src/nact/nact-preferences-editor.c
+++ b/src/nact/nact-preferences-editor.c
@@ -43,7 +43,7 @@
#include <core/fma-import-mode.h>
#include <core/fma-importer.h>
#include <core/fma-ioptions-list.h>
-#include <core/na-iprefs.h>
+#include <core/fma-iprefs.h>
#include <core/na-tokens.h>
#include "nact-application.h"
@@ -625,7 +625,7 @@ order_mode_setup( NactPreferencesEditor *editor )
GtkWidget *active_button;
GCallback active_handler;
- editor->private->order_mode = na_iprefs_get_order_mode( &editor->private->order_mode_mandatory );
+ editor->private->order_mode = fma_iprefs_get_order_mode( &editor->private->order_mode_mandatory );
editable = !editor->private->preferences_locked && !editor->private->order_mode_mandatory;
alpha_asc_button = base_window_get_widget( BASE_WINDOW( editor ), "OrderAlphaAscButton" );
@@ -1198,7 +1198,7 @@ on_dialog_ok( BaseDialog *dialog )
/* first tab: runtime preferences
*/
if( !editor->private->order_mode_mandatory ){
- na_iprefs_set_order_mode( editor->private->order_mode );
+ fma_iprefs_set_order_mode( editor->private->order_mode );
}
if( !editor->private->root_menu_mandatory ){
na_settings_set_boolean( NA_IPREFS_ITEMS_CREATE_ROOT_MENU, editor->private->root_menu
);
diff --git a/src/nact/nact-sort-buttons.c b/src/nact/nact-sort-buttons.c
index 1c53f02..3e3be9f 100644
--- a/src/nact/nact-sort-buttons.c
+++ b/src/nact/nact-sort-buttons.c
@@ -32,7 +32,7 @@
#endif
#include "core/fma-gtk-utils.h"
-#include "core/na-iprefs.h"
+#include "core/fma-iprefs.h"
#include "core/na-updater.h"
#include "nact-application.h"
@@ -286,7 +286,7 @@ on_toggle_button_toggled( GtkToggleButton *toggled_button, NactSortButtons *butt
}
gtk_toggle_button_set_active( toggled_button, TRUE );
priv->active = ibtn;
- na_iprefs_set_order_mode( st_toggle_group[ibtn].order_mode );
+ fma_iprefs_set_order_mode( st_toggle_group[ibtn].order_mode );
}
priv->toggling = FALSE;
@@ -320,7 +320,7 @@ on_settings_order_mode_changed( const gchar *group, const gchar *key, gconstpoin
if( !priv->dispose_has_run ){
order_mode_str = ( const gchar * ) new_value;
- order_mode = na_iprefs_get_order_mode_by_label( order_mode_str );
+ order_mode = fma_iprefs_get_order_mode_by_label( order_mode_str );
g_debug( "%s: group=%s, key=%s, order_mode=%u (%s), mandatory=%s, sort_buttons=%p (%s)",
thisfn, group, key, order_mode, order_mode_str,
@@ -380,7 +380,7 @@ enable_buttons( const NactSortButtons *sort_buttons, gboolean enabled )
}
if( finally_enabled && priv->active == -1 ){
- order_mode = na_iprefs_get_order_mode( NULL );
+ order_mode = fma_iprefs_get_order_mode( NULL );
i = toggle_group_get_from_mode( order_mode );
gtk_toggle_button_set_active( st_toggle_group[i].button, TRUE );
}
diff --git a/src/nact/nact-tree-model.c b/src/nact/nact-tree-model.c
index 6dd0984..a57da0f 100644
--- a/src/nact/nact-tree-model.c
+++ b/src/nact/nact-tree-model.c
@@ -36,7 +36,7 @@
#include "api/fma-object-api.h"
-#include "core/na-iprefs.h"
+#include "core/fma-iprefs.h"
#include "nact-application.h"
#include "nact-clipboard.h"
@@ -396,7 +396,7 @@ nact_tree_model_new( GtkTreeView *treeview )
model->private->treeview = treeview;
/* initialize the sortable interface */
- order_mode = na_iprefs_get_order_mode( NULL );
+ order_mode = fma_iprefs_get_order_mode( NULL );
display_order_change( model, order_mode );
return( model );
@@ -511,7 +511,7 @@ on_settings_order_mode_changed( const gchar *group, const gchar *key, gconstpoin
if( !model->private->dispose_has_run ){
order_mode_str = ( const gchar * ) new_value;
- order_mode = na_iprefs_get_order_mode_by_label( order_mode_str );
+ order_mode = fma_iprefs_get_order_mode_by_label( order_mode_str );
g_debug( "%s: group=%s, key=%s, order_mode=%u (%s), mandatory=%s, model=%p (%s)",
thisfn, group, key, order_mode, order_mode_str,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
