Commit 60c93ad9 authored by Pierre Wieser's avatar Pierre Wieser

nact_match_list_xxx are renamed to fma_match_list_xxx

parent 0b464604
......@@ -112,8 +112,8 @@ fma_config_tool_SOURCES = \
fma-main-window.c \
fma-main-window.h \
fma-main-window-def.h \
nact-match-list.c \
nact-match-list.h \
fma-match-list.c \
fma-match-list.h \
nact-menu.c \
nact-menu.h \
nact-menu-edit.c \
......
......@@ -41,7 +41,7 @@
#include "fma-ibasenames-tab.h"
#include "fma-main-tab.h"
#include "fma-main-window.h"
#include "nact-match-list.h"
#include "fma-match-list.h"
/* private interface data
*/
......@@ -190,7 +190,7 @@ initialize_gtk( FMAIBasenamesTab *instance )
g_debug( "%s: instance=%p (%s)",
thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ));
nact_match_list_init_with_args(
fma_match_list_init_with_args(
FMA_MAIN_WINDOW( instance ),
ITAB_NAME,
TAB_BASENAMES,
......
......@@ -40,7 +40,7 @@
#include "fma-main-tab.h"
#include "fma-main-window.h"
#include "nact-match-list.h"
#include "fma-match-list.h"
#include "fma-add-capability-dialog.h"
#include "fma-icapabilities-tab.h"
......@@ -169,7 +169,7 @@ initialize_gtk( FMAICapabilitiesTab *instance )
g_debug( "%s: instance=%p (%s)",
thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ));
nact_match_list_init_with_args(
fma_match_list_init_with_args(
FMA_MAIN_WINDOW( instance ),
ITAB_NAME,
TAB_CAPABILITIES,
......@@ -228,11 +228,11 @@ on_add_clicked( GtkButton *button, FMAICapabilitiesTab *instance )
g_object_get( G_OBJECT( instance ), MAIN_PROP_CONTEXT, &context, NULL );
if( context ){
capabilities = nact_match_list_get_rows( FMA_MAIN_WINDOW( instance ), ITAB_NAME );
capabilities = fma_match_list_get_rows( FMA_MAIN_WINDOW( instance ), ITAB_NAME );
new_cap = fma_add_capability_dialog_run( FMA_MAIN_WINDOW( instance ), capabilities );
if( new_cap ){
nact_match_list_insert_row( FMA_MAIN_WINDOW( instance ), ITAB_NAME, new_cap, FALSE, FALSE );
fma_match_list_insert_row( FMA_MAIN_WINDOW( instance ), ITAB_NAME, new_cap, FALSE, FALSE );
g_free( new_cap );
}
......
......@@ -43,7 +43,7 @@
#include "fma-application.h"
#include "fma-main-tab.h"
#include "fma-main-window.h"
#include "nact-match-list.h"
#include "fma-match-list.h"
#include "fma-ifolders-tab.h"
/* private interface data
......@@ -173,7 +173,7 @@ initialize_gtk( FMAIFoldersTab *instance )
g_debug( "%s: instance=%p (%s)",
thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ));
nact_match_list_init_with_args(
fma_match_list_init_with_args(
FMA_MAIN_WINDOW( instance ),
ITAB_NAME,
TAB_FOLDERS,
......@@ -260,7 +260,7 @@ on_browse_folder_clicked( GtkButton *button, FMAIFoldersTab *instance )
uri = gtk_file_chooser_get_current_folder_uri( GTK_FILE_CHOOSER( dialog ));
fma_settings_set_string( IPREFS_FOLDER_CHOOSER_URI, uri );
path = g_filename_from_uri( uri, NULL, NULL );
nact_match_list_insert_row( FMA_MAIN_WINDOW( instance ), ITAB_NAME, path, FALSE, FALSE );
fma_match_list_insert_row( FMA_MAIN_WINDOW( instance ), ITAB_NAME, path, FALSE, FALSE );
g_free( path );
g_free( uri );
}
......
......@@ -39,7 +39,7 @@
#include "fma-main-tab.h"
#include "fma-main-window.h"
#include "nact-match-list.h"
#include "fma-match-list.h"
#include "fma-imimetypes-tab.h"
/* private interface data
......@@ -174,7 +174,7 @@ initialize_gtk( FMAIMimetypesTab *instance )
g_debug( "%s: instance=%p (%s)",
thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ));
nact_match_list_init_with_args(
fma_match_list_init_with_args(
FMA_MAIN_WINDOW( instance ),
ITAB_NAME,
TAB_MIMETYPES,
......
......@@ -41,7 +41,7 @@
#include "base-gtk-utils.h"
#include "fma-main-tab.h"
#include "fma-main-window.h"
#include "nact-match-list.h"
#include "fma-match-list.h"
#include "fma-add-scheme-dialog.h"
#include "fma-ischemes-tab.h"
......@@ -172,7 +172,7 @@ initialize_gtk( FMAISchemesTab *instance )
g_debug( "%s: instance=%p (%s)",
thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ));
nact_match_list_init_with_args(
fma_match_list_init_with_args(
FMA_MAIN_WINDOW( instance ),
ITAB_NAME,
TAB_SCHEMES,
......@@ -239,12 +239,12 @@ on_add_from_defaults( GtkButton *button, FMAISchemesTab *instance )
g_object_get( G_OBJECT( instance ), MAIN_PROP_CONTEXT, &context, NULL );
g_return_if_fail( context );
schemes = nact_match_list_get_rows( FMA_MAIN_WINDOW( instance ), ITAB_NAME );
schemes = fma_match_list_get_rows( FMA_MAIN_WINDOW( instance ), ITAB_NAME );
new_scheme = fma_add_scheme_dialog_run( FMA_MAIN_WINDOW( instance ), schemes );
fma_core_utils_slist_free( schemes );
if( new_scheme ){
nact_match_list_insert_row( FMA_MAIN_WINDOW( instance ), ITAB_NAME, new_scheme, FALSE, FALSE );
fma_match_list_insert_row( FMA_MAIN_WINDOW( instance ), ITAB_NAME, new_scheme, FALSE, FALSE );
g_free( new_scheme );
}
}
......
......@@ -41,7 +41,7 @@
#include "base-gtk-utils.h"
#include "fma-main-tab.h"
#include "fma-main-window.h"
#include "nact-match-list.h"
#include "fma-match-list.h"
/* column ordering
*/
......@@ -62,7 +62,7 @@ typedef struct {
* addressed with the tab name
*/
typedef struct {
FMAMainWindow *window;
FMAMainWindow *window;
gchar *tab_name;
guint tab_id;
GtkTreeView *listview;
......@@ -125,7 +125,7 @@ static void sort_on_column( GtkTreeViewColumn *treeviewcolumn, MatchList
static void on_instance_finalized( MatchListData *data, BaseWindow *window );
/**
* nact_match_list_init_with_args:
* fma_match_list_init_with_args:
* @window: the #FMAMainWindow window which contains the view.
* @tab_name: a string constant which identifies this page.
* @tab_id: our id for this page.
......@@ -145,7 +145,7 @@ static void on_instance_finalized( MatchListData *data, BaseWindow *wind
* here pointers to GtkTreeView and GtkButton widgets.
*/
void
nact_match_list_init_with_args( FMAMainWindow *window, const gchar *tab_name,
fma_match_list_init_with_args( FMAMainWindow *window, const gchar *tab_name,
guint tab_id,
GtkWidget *listview,
GtkWidget *addbutton,
......@@ -158,7 +158,7 @@ nact_match_list_init_with_args( FMAMainWindow *window, const gchar *tab_name,
const gchar *item_header,
gboolean editable_filter )
{
static const gchar *thisfn = "nact_match_list_init_with_args";
static const gchar *thisfn = "fma_match_list_init_with_args";
MatchListData *data;
g_return_if_fail( window && FMA_IS_MAIN_WINDOW( window ));
......@@ -326,7 +326,7 @@ initialize_window( MatchListData *data )
static void
on_tree_selection_changed( NactTreeView *treeview, GList *selected_items, MatchListData *data )
{
static const gchar *thisfn = "nact_match_list_on_tree_selection_changed";
static const gchar *thisfn = "fma_match_list_on_tree_selection_changed";
FMAIContext *context;
gboolean enable_tab;
GSList *filters;
......@@ -378,7 +378,7 @@ on_tree_selection_changed( NactTreeView *treeview, GList *selected_items, MatchL
}
/**
* nact_match_list_insert_row:
* fma_match_list_insert_row:
* @window: the #FMAMainWindow window which contains the view.
* @tab_name: a string constant which identifies this page.
* @filter: the item to add.
......@@ -388,7 +388,7 @@ on_tree_selection_changed( NactTreeView *treeview, GList *selected_items, MatchL
* Add a new row to the list view.
*/
void
nact_match_list_insert_row( FMAMainWindow *window, const gchar *tab_name, const gchar *filter, gboolean match, gboolean not_match )
fma_match_list_insert_row( FMAMainWindow *window, const gchar *tab_name, const gchar *filter, gboolean match, gboolean not_match )
{
MatchListData *data;
......@@ -399,7 +399,7 @@ nact_match_list_insert_row( FMAMainWindow *window, const gchar *tab_name, const
}
/**
* nact_match_list_get_rows:
* fma_match_list_get_rows:
* @window: the #FMAMainWindow window which contains the view.
* @tab_name: a string constant which identifies this page.
*
......@@ -407,7 +407,7 @@ nact_match_list_insert_row( FMAMainWindow *window, const gchar *tab_name, const
* be fma_core_utils_slist_free() by the caller.
*/
GSList *
nact_match_list_get_rows( FMAMainWindow *window, const gchar *tab_name )
fma_match_list_get_rows( FMAMainWindow *window, const gchar *tab_name )
{
GSList *filters;
MatchListData *data;
......@@ -442,7 +442,7 @@ on_filter_clicked( GtkTreeViewColumn *treeviewcolumn, MatchListData *data )
static void
on_filter_edited( GtkCellRendererText *renderer, const gchar *path_str, const gchar *text, MatchListData *data )
{
static const gchar *thisfn = "nact_match_list_on_filter_edited";
static const gchar *thisfn = "fma_match_list_on_filter_edited";
GtkTreeModel *model;
GtkTreeIter iter;
GtkTreePath *path;
......@@ -564,7 +564,7 @@ on_must_match_clicked( GtkTreeViewColumn *treeviewcolumn, MatchListData *data )
static void
on_must_match_toggled( GtkCellRendererToggle *cell_renderer, gchar *path_str, MatchListData *data )
{
/*static const gchar *thisfn = "nact_match_list_on_must_match_toggled";*/
/*static const gchar *thisfn = "fma_match_list_on_must_match_toggled";*/
gchar *filter;
FMAIContext *context;
GSList *filters;
......@@ -616,7 +616,7 @@ on_must_not_match_clicked( GtkTreeViewColumn *treeviewcolumn, MatchListData *dat
static void
on_must_not_match_toggled( GtkCellRendererToggle *cell_renderer, gchar *path_str, MatchListData *data )
{
/*static const gchar *thisfn = "nact_match_list_on_must_not_match_toggled";*/
/*static const gchar *thisfn = "fma_match_list_on_must_not_match_toggled";*/
gchar *filter;
FMAIContext *context;
GSList *filters;
......@@ -779,7 +779,7 @@ dump_current_rows( MatchListData *data )
model = gtk_tree_view_get_model( data->listview );
filters = NULL;
gtk_tree_model_foreach( model, ( GtkTreeModelForeachFunc ) get_rows_iter, &filters );
fma_core_utils_slist_dump( "nact_match_list_dump_current_rows", filters );
fma_core_utils_slist_dump( "fma_match_list_dump_current_rows", filters );
fma_core_utils_slist_free( filters );
#endif
}
......@@ -996,7 +996,7 @@ sort_on_column( GtkTreeViewColumn *treeviewcolumn, MatchListData *data, guint ne
static void
on_instance_finalized( MatchListData *data, BaseWindow *window )
{
static const gchar *thisfn = "nact_match_list_on_instance_finalized";
static const gchar *thisfn = "fma_match_list_on_instance_finalized";
g_return_if_fail( data != NULL );
......
......@@ -27,13 +27,13 @@
* ... and many others (see AUTHORS)
*/
#ifndef __UI_NACT_MATCH_LIST_H__
#define __UI_NACT_MATCH_LIST_H__
#ifndef __UI_FMA_MATCH_LIST_H__
#define __UI_FMA_MATCH_LIST_H__
/**
* SECTION: nact_match_list
* SECTION: fma_match_list
* @short_description: Implementation of a list match/does not match.
* @include: ui/nact-match-list.h
* @include: ui/fma-match-list.h
*
* In an ideal world, this would be a base interface for FMAISchemesTab,
* etc. interfaces.
......@@ -62,7 +62,7 @@ enum {
MATCH_LIST_MUST_MATCH_ALL_OF,
};
void nact_match_list_init_with_args( FMAMainWindow *window,
void fma_match_list_init_with_args( FMAMainWindow *window,
const gchar *tab_name,
guint tab_id,
GtkWidget *listview,
......@@ -76,15 +76,15 @@ void nact_match_list_init_with_args( FMAMainWindow *window,
const gchar *item_header,
gboolean editable_filter );
void nact_match_list_insert_row ( FMAMainWindow *window,
void fma_match_list_insert_row ( FMAMainWindow *window,
const gchar *tab_name,
const gchar *filter,
gboolean match,
gboolean not_match );
GSList *nact_match_list_get_rows ( FMAMainWindow *window,
GSList *fma_match_list_get_rows ( FMAMainWindow *window,
const gchar *tab_name );
G_END_DECLS
#endif /* __UI_NACT_MATCH_LIST_H__ */
#endif /* __UI_FMA_MATCH_LIST_H__ */
......@@ -49,7 +49,7 @@
* adding/removing a scheme is possible
*
* Starting with 2.31.x serie (future 3.0), the scheme conditions of a
* #FMAIContext are handled by nact-match-list.{c,h} set of function.
* #FMAIContext are handled by fma-match-list.{c,h} set of function.
* This set of functions is only used:
* a) to edit the preferences
* add/remove scheme
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment