[nautilus-actions/file-manager-actions] NACTAddCapabilityDialog class is renamed to FMAAddCapabilityDialog
- From: Pierre Wieser <pwieser src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus-actions/file-manager-actions] NACTAddCapabilityDialog class is renamed to FMAAddCapabilityDialog
- Date: Tue, 8 Sep 2015 18:58:51 +0000 (UTC)
commit 7fb0839d752a57332d40c38649eabc70ba30c00c
Author: Pierre Wieser <pwieser trychlos org>
Date: Tue Sep 8 19:17:29 2015 +0200
NACTAddCapabilityDialog class is renamed to FMAAddCapabilityDialog
...bility-dialog.c => fma-add-capability-dialog.c} | 52 ++++++++++----------
...bility-dialog.h => fma-add-capability-dialog.h} | 24 +++++-----
...add-scheme-dialog.c => fma-add-scheme-dialog.c} | 0
...add-scheme-dialog.h => fma-add-scheme-dialog.h} | 0
src/ui/{nact-application.c => fma-application.c} | 0
src/ui/{nact-application.h => fma-application.h} | 0
...t-assistant-export.c => fma-assistant-export.c} | 0
...t-assistant-export.h => fma-assistant-export.h} | 0
...t-assistant-import.c => fma-assistant-import.c} | 0
...t-assistant-import.h => fma-assistant-import.h} | 0
src/ui/nact-icapabilities-tab.c | 2 +-
11 files changed, 39 insertions(+), 39 deletions(-)
---
diff --git a/src/ui/nact-add-capability-dialog.c b/src/ui/fma-add-capability-dialog.c
similarity index 90%
rename from src/ui/nact-add-capability-dialog.c
rename to src/ui/fma-add-capability-dialog.c
index b2f2203..c527b5f 100644
--- a/src/ui/nact-add-capability-dialog.c
+++ b/src/ui/fma-add-capability-dialog.c
@@ -108,7 +108,7 @@ static void send_ok( NactAddCapabilityDialog *dialog );
static void on_dialog_ok( BaseDialog *dialog );
GType
-nact_add_capability_dialog_get_type( void )
+fma_add_capability_dialog_get_type( void )
{
static GType dialog_type = 0;
@@ -122,7 +122,7 @@ nact_add_capability_dialog_get_type( void )
static GType
register_type( void )
{
- static const gchar *thisfn = "nact_add_capability_dialog_register_type";
+ static const gchar *thisfn = "fma_add_capability_dialog_register_type";
GType type;
static GTypeInfo info = {
@@ -147,7 +147,7 @@ register_type( void )
static void
class_init( NactAddCapabilityDialogClass *klass )
{
- static const gchar *thisfn = "nact_add_capability_dialog_class_init";
+ static const gchar *thisfn = "fma_add_capability_dialog_class_init";
GObjectClass *object_class;
BaseDialogClass *dialog_class;
@@ -169,14 +169,14 @@ class_init( NactAddCapabilityDialogClass *klass )
static void
instance_init( GTypeInstance *instance, gpointer klass )
{
- static const gchar *thisfn = "nact_add_capability_dialog_instance_init";
+ static const gchar *thisfn = "fma_add_capability_dialog_instance_init";
NactAddCapabilityDialog *self;
- g_return_if_fail( NACT_IS_ADD_CAPABILITY_DIALOG( instance ));
+ g_return_if_fail( FMA_IS_ADD_CAPABILITY_DIALOG( instance ));
g_debug( "%s: instance=%p, klass=%p", thisfn, ( void * ) instance, ( void * ) klass );
- self = NACT_ADD_CAPABILITY_DIALOG( instance );
+ self = FMA_ADD_CAPABILITY_DIALOG( instance );
self->private = g_new0( NactAddCapabilityDialogPrivate, 1 );
@@ -187,12 +187,12 @@ instance_init( GTypeInstance *instance, gpointer klass )
static void
instance_constructed( GObject *dialog )
{
- static const gchar *thisfn = "nact_add_capability_dialog_instance_constructed";
+ static const gchar *thisfn = "fma_add_capability_dialog_instance_constructed";
NactAddCapabilityDialogPrivate *priv;
- g_return_if_fail( NACT_IS_ADD_CAPABILITY_DIALOG( dialog ));
+ g_return_if_fail( FMA_IS_ADD_CAPABILITY_DIALOG( dialog ));
- priv = NACT_ADD_CAPABILITY_DIALOG( dialog )->private;
+ priv = FMA_ADD_CAPABILITY_DIALOG( dialog )->private;
if( !priv->dispose_has_run ){
@@ -226,15 +226,15 @@ instance_constructed( GObject *dialog )
static void
instance_dispose( GObject *dialog )
{
- static const gchar *thisfn = "nact_add_capability_dialog_instance_dispose";
+ static const gchar *thisfn = "fma_add_capability_dialog_instance_dispose";
NactAddCapabilityDialog *self;
GtkTreeView *listview;
GtkTreeModel *model;
GtkTreeSelection *selection;
- g_return_if_fail( NACT_IS_ADD_CAPABILITY_DIALOG( dialog ));
+ g_return_if_fail( FMA_IS_ADD_CAPABILITY_DIALOG( dialog ));
- self = NACT_ADD_CAPABILITY_DIALOG( dialog );
+ self = FMA_ADD_CAPABILITY_DIALOG( dialog );
if( !self->private->dispose_has_run ){
g_debug( "%s: dialog=%p (%s)", thisfn, ( void * ) dialog, G_OBJECT_TYPE_NAME( dialog ));
@@ -257,14 +257,14 @@ instance_dispose( GObject *dialog )
static void
instance_finalize( GObject *dialog )
{
- static const gchar *thisfn = "nact_add_capability_dialog_instance_finalize";
+ static const gchar *thisfn = "fma_add_capability_dialog_instance_finalize";
NactAddCapabilityDialog *self;
- g_return_if_fail( NACT_IS_ADD_CAPABILITY_DIALOG( dialog ));
+ g_return_if_fail( FMA_IS_ADD_CAPABILITY_DIALOG( dialog ));
g_debug( "%s: dialog=%p (%s)", thisfn, ( void * ) dialog, G_OBJECT_TYPE_NAME( dialog ));
- self = NACT_ADD_CAPABILITY_DIALOG( dialog );
+ self = FMA_ADD_CAPABILITY_DIALOG( dialog );
fma_core_utils_slist_free( self->private->already_used );
g_free( self->private->capability );
@@ -278,7 +278,7 @@ instance_finalize( GObject *dialog )
}
/**
- * nact_add_capability_dialog_run:
+ * fma_add_capability_dialog_run:
* @parent: the BaseWindow parent of this dialog
* (usually the NactMainWindow).
* @capabilities: list of already used capabilities.
@@ -289,9 +289,9 @@ instance_finalize( GObject *dialog )
* be g_free() by the caller, or NULL.
*/
gchar *
-nact_add_capability_dialog_run( NactMainWindow *parent, GSList *capabilities )
+fma_add_capability_dialog_run( NactMainWindow *parent, GSList *capabilities )
{
- static const gchar *thisfn = "nact_add_capability_dialog_run";
+ static const gchar *thisfn = "fma_add_capability_dialog_run";
NactAddCapabilityDialog *dialog;
gchar *capability;
@@ -299,7 +299,7 @@ nact_add_capability_dialog_run( NactMainWindow *parent, GSList *capabilities )
g_return_val_if_fail( GTK_IS_APPLICATION_WINDOW( parent ), NULL );
- dialog = g_object_new( NACT_TYPE_ADD_CAPABILITY_DIALOG,
+ dialog = g_object_new( FMA_TYPE_ADD_CAPABILITY_DIALOG,
BASE_PROP_MAIN_WINDOW, parent,
BASE_PROP_XMLUI_FILENAME, st_xmlui_filename,
BASE_PROP_TOPLEVEL_NAME, st_toplevel_name,
@@ -321,14 +321,14 @@ nact_add_capability_dialog_run( NactMainWindow *parent, GSList *capabilities )
static void
on_base_initialize_gtk( NactAddCapabilityDialog *dialog, GtkDialog *toplevel, gpointer user_data )
{
- static const gchar *thisfn = "nact_add_capability_dialog_on_base_initialize_gtk";
+ static const gchar *thisfn = "fma_add_capability_dialog_on_base_initialize_gtk";
GtkTreeView *listview;
GtkTreeModel *model;
GtkTreeViewColumn *column;
GtkCellRenderer *text_cell;
GtkTreeSelection *selection;
- g_return_if_fail( NACT_IS_ADD_CAPABILITY_DIALOG( dialog ));
+ g_return_if_fail( FMA_IS_ADD_CAPABILITY_DIALOG( dialog ));
if( !dialog->private->dispose_has_run ){
@@ -372,13 +372,13 @@ on_base_initialize_gtk( NactAddCapabilityDialog *dialog, GtkDialog *toplevel, gp
static void
on_base_initialize_window( NactAddCapabilityDialog *dialog, gpointer user_data )
{
- static const gchar *thisfn = "nact_add_capability_dialog_on_base_initialize_window";
+ static const gchar *thisfn = "fma_add_capability_dialog_on_base_initialize_window";
GtkTreeView *listview;
GtkListStore *model;
GtkTreeIter row;
guint i;
- g_return_if_fail( NACT_IS_ADD_CAPABILITY_DIALOG( dialog ));
+ g_return_if_fail( FMA_IS_ADD_CAPABILITY_DIALOG( dialog ));
if( !dialog->private->dispose_has_run ){
@@ -416,12 +416,12 @@ on_base_initialize_window( NactAddCapabilityDialog *dialog, gpointer user_data )
static void
on_base_show_widgets( NactAddCapabilityDialog *dialog, gpointer user_data )
{
- static const gchar *thisfn = "nact_add_capability_dialog_on_base_show_widgets";
+ static const gchar *thisfn = "fma_add_capability_dialog_on_base_show_widgets";
GtkTreeView *listview;
GtkTreePath *path;
GtkTreeSelection *selection;
- g_return_if_fail( NACT_IS_ADD_CAPABILITY_DIALOG( dialog ));
+ g_return_if_fail( FMA_IS_ADD_CAPABILITY_DIALOG( dialog ));
if( !dialog->private->dispose_has_run ){
@@ -566,7 +566,7 @@ on_dialog_ok( BaseDialog *dialog )
GtkTreePath *path;
GtkTreeIter iter;
- editor = NACT_ADD_CAPABILITY_DIALOG( dialog );
+ editor = FMA_ADD_CAPABILITY_DIALOG( dialog );
listview = GTK_TREE_VIEW( base_window_get_widget( BASE_WINDOW( editor ), "CapabilitiesTreeView" ));
selection = gtk_tree_view_get_selection( listview );
diff --git a/src/ui/nact-add-capability-dialog.h b/src/ui/fma-add-capability-dialog.h
similarity index 64%
rename from src/ui/nact-add-capability-dialog.h
rename to src/ui/fma-add-capability-dialog.h
index 7a631ce..4f5c9ca 100644
--- a/src/ui/nact-add-capability-dialog.h
+++ b/src/ui/fma-add-capability-dialog.h
@@ -27,11 +27,11 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __UI_NACT_ADD_CAPABILITY_DIALOG_H__
-#define __UI_NACT_ADD_CAPABILITY_DIALOG_H__
+#ifndef __UI_FMA_ADD_CAPABILITY_DIALOG_H__
+#define __UI_FMA_ADD_CAPABILITY_DIALOG_H__
/**
- * SECTION: nact_add_capability_dialog
+ * SECTION: fma_add_capability_dialog
* @short_description: #NactAddCapabilityDialog class definition.
* @include: nact/nact-add-capability-dialog.h
*
@@ -44,12 +44,12 @@
G_BEGIN_DECLS
-#define NACT_TYPE_ADD_CAPABILITY_DIALOG ( nact_add_capability_dialog_get_type())
-#define NACT_ADD_CAPABILITY_DIALOG( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object,
NACT_TYPE_ADD_CAPABILITY_DIALOG, NactAddCapabilityDialog ))
-#define NACT_ADD_CAPABILITY_DIALOG_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass,
NACT_TYPE_ADD_CAPABILITY_DIALOG, NactAddCapabilityDialogClass ))
-#define NACT_IS_ADD_CAPABILITY_DIALOG( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object,
NACT_TYPE_ADD_CAPABILITY_DIALOG ))
-#define NACT_IS_ADD_CAPABILITY_DIALOG_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ),
NACT_TYPE_ADD_CAPABILITY_DIALOG ))
-#define NACT_ADD_CAPABILITY_DIALOG_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ),
NACT_TYPE_ADD_CAPABILITY_DIALOG, NactAddCapabilityDialogClass ))
+#define FMA_TYPE_ADD_CAPABILITY_DIALOG ( fma_add_capability_dialog_get_type())
+#define FMA_ADD_CAPABILITY_DIALOG( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object,
FMA_TYPE_ADD_CAPABILITY_DIALOG, NactAddCapabilityDialog ))
+#define FMA_ADD_CAPABILITY_DIALOG_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass,
FMA_TYPE_ADD_CAPABILITY_DIALOG, NactAddCapabilityDialogClass ))
+#define FMA_IS_ADD_CAPABILITY_DIALOG( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object,
FMA_TYPE_ADD_CAPABILITY_DIALOG ))
+#define FMA_IS_ADD_CAPABILITY_DIALOG_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ),
FMA_TYPE_ADD_CAPABILITY_DIALOG ))
+#define FMA_ADD_CAPABILITY_DIALOG_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ),
FMA_TYPE_ADD_CAPABILITY_DIALOG, NactAddCapabilityDialogClass ))
typedef struct _NactAddCapabilityDialogPrivate NactAddCapabilityDialogPrivate;
@@ -69,11 +69,11 @@ typedef struct {
}
NactAddCapabilityDialogClass;
-GType nact_add_capability_dialog_get_type( void );
+GType fma_add_capability_dialog_get_type( void );
-gchar *nact_add_capability_dialog_run ( NactMainWindow *parent,
+gchar *fma_add_capability_dialog_run ( NactMainWindow *parent,
GSList *capabilities );
G_END_DECLS
-#endif /* __UI_NACT_ADD_CAPABILITY_DIALOG_H__ */
+#endif /* __UI_FMA_ADD_CAPABILITY_DIALOG_H__ */
diff --git a/src/ui/nact-add-scheme-dialog.c b/src/ui/fma-add-scheme-dialog.c
similarity index 100%
rename from src/ui/nact-add-scheme-dialog.c
rename to src/ui/fma-add-scheme-dialog.c
diff --git a/src/ui/nact-add-scheme-dialog.h b/src/ui/fma-add-scheme-dialog.h
similarity index 100%
rename from src/ui/nact-add-scheme-dialog.h
rename to src/ui/fma-add-scheme-dialog.h
diff --git a/src/ui/nact-application.c b/src/ui/fma-application.c
similarity index 100%
rename from src/ui/nact-application.c
rename to src/ui/fma-application.c
diff --git a/src/ui/nact-application.h b/src/ui/fma-application.h
similarity index 100%
rename from src/ui/nact-application.h
rename to src/ui/fma-application.h
diff --git a/src/ui/nact-assistant-export.c b/src/ui/fma-assistant-export.c
similarity index 100%
rename from src/ui/nact-assistant-export.c
rename to src/ui/fma-assistant-export.c
diff --git a/src/ui/nact-assistant-export.h b/src/ui/fma-assistant-export.h
similarity index 100%
rename from src/ui/nact-assistant-export.h
rename to src/ui/fma-assistant-export.h
diff --git a/src/ui/nact-assistant-import.c b/src/ui/fma-assistant-import.c
similarity index 100%
rename from src/ui/nact-assistant-import.c
rename to src/ui/fma-assistant-import.c
diff --git a/src/ui/nact-assistant-import.h b/src/ui/fma-assistant-import.h
similarity index 100%
rename from src/ui/nact-assistant-import.h
rename to src/ui/fma-assistant-import.h
diff --git a/src/ui/nact-icapabilities-tab.c b/src/ui/nact-icapabilities-tab.c
index e6c4034..03b2f3a 100644
--- a/src/ui/nact-icapabilities-tab.c
+++ b/src/ui/nact-icapabilities-tab.c
@@ -229,7 +229,7 @@ on_add_clicked( GtkButton *button, NactICapabilitiesTab *instance )
if( context ){
capabilities = nact_match_list_get_rows( NACT_MAIN_WINDOW( instance ), ITAB_NAME );
- new_cap = nact_add_capability_dialog_run( NACT_MAIN_WINDOW( instance ), capabilities );
+ new_cap = fma_add_capability_dialog_run( NACT_MAIN_WINDOW( instance ), capabilities );
if( new_cap ){
nact_match_list_insert_row( NACT_MAIN_WINDOW( instance ), ITAB_NAME, new_cap, FALSE,
FALSE );
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]