[nautilus-actions/file-manager-actions] NactSortButtons class is renamed to FMASortButtons
- From: Pierre Wieser <pwieser src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus-actions/file-manager-actions] NactSortButtons class is renamed to FMASortButtons
- Date: Tue, 8 Sep 2015 19:01:08 +0000 (UTC)
commit 3e12bfebe3663f7ec84ae3748041e37718dba20a
Author: Pierre Wieser <pwieser trychlos org>
Date: Tue Sep 8 20:29:59 2015 +0200
NactSortButtons class is renamed to FMASortButtons
src/ui/Makefile.am | 4 +-
src/ui/fma-main-window-def.h | 2 +-
src/ui/fma-main-window.c | 12 ++--
src/ui/fma-main-window.h | 4 +-
src/ui/{nact-sort-buttons.c => fma-sort-buttons.c} | 92 ++++++++++----------
src/ui/{nact-sort-buttons.h => fma-sort-buttons.h} | 40 ++++----
6 files changed, 77 insertions(+), 77 deletions(-)
---
diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am
index 794d549..fda759b 100644
--- a/src/ui/Makefile.am
+++ b/src/ui/Makefile.am
@@ -128,8 +128,8 @@ fma_config_tool_SOURCES = \
fma-providers-list.h \
fma-schemes-list.c \
fma-schemes-list.h \
- nact-sort-buttons.c \
- nact-sort-buttons.h \
+ fma-sort-buttons.c \
+ fma-sort-buttons.h \
nact-statusbar.c \
nact-statusbar.h \
nact-tree-ieditable.c \
diff --git a/src/ui/fma-main-window-def.h b/src/ui/fma-main-window-def.h
index aecadfc..b1f4a38 100644
--- a/src/ui/fma-main-window-def.h
+++ b/src/ui/fma-main-window-def.h
@@ -66,7 +66,7 @@
* | +-> setup_main_ui()
* | setup_treeview()
* | fma_clipboard_new()
- * | nact_sort_buttons_new()
+ * | fma_sort_buttons_new()
* |
* | fma_iaction_tab_init()
* | fma_icommand_tab_init()
diff --git a/src/ui/fma-main-window.c b/src/ui/fma-main-window.c
index efcf1d1..c8a2984 100644
--- a/src/ui/fma-main-window.c
+++ b/src/ui/fma-main-window.c
@@ -58,7 +58,7 @@
#include "nact-statusbar.h"
#include "nact-tree-view.h"
#include "fma-confirm-logout.h"
-#include "nact-sort-buttons.h"
+#include "fma-sort-buttons.h"
/* private instance data
*/
@@ -116,7 +116,7 @@ struct _FMAMainWindowPrivate {
gboolean is_tree_modified;
FMAClipboard *clipboard;
NactStatusbar *statusbar;
- NactSortButtons *sort_buttons;
+ FMASortButtons *sort_buttons;
gulong pivot_handler_id;
FMATimeout pivot_timeout;
@@ -666,7 +666,7 @@ fma_main_window_new( FMAApplication *application )
fma_menu_win( window );
window->private->clipboard = fma_clipboard_new( window );
- window->private->sort_buttons = nact_sort_buttons_new( window );
+ window->private->sort_buttons = fma_sort_buttons_new( window );
/* initialize the notebook interfaces
* and monitor the updates which originates from each property tab
@@ -835,12 +835,12 @@ fma_main_window_get_clipboard( const FMAMainWindow *window )
* fma_main_window_get_sort_buttons:
* @window: this #FMAMainWindow instance.
*
- * Returns: the #NactSortButtons object.
+ * Returns: the #FMASortButtons object.
*/
-NactSortButtons *
+FMASortButtons *
fma_main_window_get_sort_buttons( const FMAMainWindow *window )
{
- NactSortButtons *buttons;
+ FMASortButtons *buttons;
g_return_val_if_fail( window && FMA_IS_MAIN_WINDOW( window ), NULL );
diff --git a/src/ui/fma-main-window.h b/src/ui/fma-main-window.h
index ed0419e..f13191e 100644
--- a/src/ui/fma-main-window.h
+++ b/src/ui/fma-main-window.h
@@ -40,7 +40,7 @@
#include "fma-application.h"
#include "fma-clipboard.h"
#include "fma-main-window-def.h"
-#include "nact-sort-buttons.h"
+#include "fma-sort-buttons.h"
#include "nact-statusbar.h"
#include "nact-tree-view.h"
@@ -75,7 +75,7 @@ FMAMainWindow *fma_main_window_new ( FMAApplication *application );
FMAClipboard *fma_main_window_get_clipboard ( const FMAMainWindow *window );
-NactSortButtons *fma_main_window_get_sort_buttons( const FMAMainWindow *window );
+FMASortButtons *fma_main_window_get_sort_buttons( const FMAMainWindow *window );
NactStatusbar *fma_main_window_get_statusbar ( const FMAMainWindow *window );
diff --git a/src/ui/nact-sort-buttons.c b/src/ui/fma-sort-buttons.c
similarity index 81%
rename from src/ui/nact-sort-buttons.c
rename to src/ui/fma-sort-buttons.c
index f4d3c13..fb1fcf9 100644
--- a/src/ui/nact-sort-buttons.c
+++ b/src/ui/fma-sort-buttons.c
@@ -37,10 +37,10 @@
#include "fma-application.h"
#include "fma-main-window.h"
-#include "nact-sort-buttons.h"
+#include "fma-sort-buttons.h"
#include "nact-tree-view.h"
-struct _NactSortButtonsPrivate {
+struct _FMASortButtonsPrivate {
gboolean dispose_has_run;
FMAUpdater *updater;
gboolean toggling;
@@ -65,20 +65,20 @@ static ToggleGroup st_toggle_group [] = {
static GObjectClass *st_parent_class = NULL;
static GType register_type( void );
-static void class_init( NactSortButtonsClass *klass );
+static void class_init( FMASortButtonsClass *klass );
static void instance_init( GTypeInstance *instance, gpointer klass );
static void instance_dispose( GObject *application );
static void instance_finalize( GObject *application );
-static void initialize_buttons( NactSortButtons *buttons, FMAMainWindow *window );
-static void on_toggle_button_toggled( GtkToggleButton *button, NactSortButtons *buttons );
-static void on_settings_order_mode_changed( const gchar *group, const gchar *key, gconstpointer new_value,
gboolean mandatory, NactSortButtons *sort_buttons );
-static void on_tree_view_count_changed( NactTreeView *treeview, gboolean reset, gint menus_count, gint
actions_count, gint profiles_count, NactSortButtons *sort_buttons );
-static void enable_buttons( const NactSortButtons *sort_buttons, gboolean enabled );
+static void initialize_buttons( FMASortButtons *buttons, FMAMainWindow *window );
+static void on_toggle_button_toggled( GtkToggleButton *button, FMASortButtons *buttons );
+static void on_settings_order_mode_changed( const gchar *group, const gchar *key, gconstpointer new_value,
gboolean mandatory, FMASortButtons *sort_buttons );
+static void on_tree_view_count_changed( NactTreeView *treeview, gboolean reset, gint menus_count, gint
actions_count, gint profiles_count, FMASortButtons *sort_buttons );
+static void enable_buttons( const FMASortButtons *sort_buttons, gboolean enabled );
static gint toggle_group_get_from_mode( guint mode );
static gint toggle_group_get_from_button( GtkToggleButton *toggled_button );
GType
-nact_sort_buttons_get_type( void )
+fma_sort_buttons_get_type( void )
{
static GType type = 0;
@@ -92,32 +92,32 @@ nact_sort_buttons_get_type( void )
static GType
register_type( void )
{
- static const gchar *thisfn = "nact_sort_buttons_register_type";
+ static const gchar *thisfn = "fma_sort_buttons_register_type";
GType type;
static GTypeInfo info = {
- sizeof( NactSortButtonsClass ),
+ sizeof( FMASortButtonsClass ),
( GBaseInitFunc ) NULL,
( GBaseFinalizeFunc ) NULL,
( GClassInitFunc ) class_init,
NULL,
NULL,
- sizeof( NactSortButtons ),
+ sizeof( FMASortButtons ),
0,
( GInstanceInitFunc ) instance_init
};
g_debug( "%s", thisfn );
- type = g_type_register_static( G_TYPE_OBJECT, "NactSortButtons", &info, 0 );
+ type = g_type_register_static( G_TYPE_OBJECT, "FMASortButtons", &info, 0 );
return( type );
}
static void
-class_init( NactSortButtonsClass *klass )
+class_init( FMASortButtonsClass *klass )
{
- static const gchar *thisfn = "nact_sort_buttons_class_init";
+ static const gchar *thisfn = "fma_sort_buttons_class_init";
GObjectClass *object_class;
g_debug( "%s: klass=%p", thisfn, ( void * ) klass );
@@ -132,17 +132,17 @@ class_init( NactSortButtonsClass *klass )
static void
instance_init( GTypeInstance *instance, gpointer klass )
{
- static const gchar *thisfn = "nact_sort_buttons_instance_init";
- NactSortButtons *self;
+ static const gchar *thisfn = "fma_sort_buttons_instance_init";
+ FMASortButtons *self;
- g_return_if_fail( NACT_IS_SORT_BUTTONS( instance ));
+ g_return_if_fail( FMA_IS_SORT_BUTTONS( instance ));
g_debug( "%s: instance=%p (%s), klass=%p",
thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ), ( void * ) klass );
- self = NACT_SORT_BUTTONS( instance );
+ self = FMA_SORT_BUTTONS( instance );
- self->private = g_new0( NactSortButtonsPrivate, 1 );
+ self->private = g_new0( FMASortButtonsPrivate, 1 );
self->private->dispose_has_run = FALSE;
self->private->toggling = FALSE;
@@ -153,12 +153,12 @@ instance_init( GTypeInstance *instance, gpointer klass )
static void
instance_dispose( GObject *object )
{
- static const gchar *thisfn = "nact_sort_buttons_instance_dispose";
- NactSortButtons *self;
+ static const gchar *thisfn = "fma_sort_buttons_instance_dispose";
+ FMASortButtons *self;
- g_return_if_fail( NACT_IS_SORT_BUTTONS( object ));
+ g_return_if_fail( FMA_IS_SORT_BUTTONS( object ));
- self = NACT_SORT_BUTTONS( object );
+ self = FMA_SORT_BUTTONS( object );
if( !self->private->dispose_has_run ){
g_debug( "%s: object=%p (%s)", thisfn, ( void * ) object, G_OBJECT_TYPE_NAME( object ));
@@ -175,14 +175,14 @@ instance_dispose( GObject *object )
static void
instance_finalize( GObject *instance )
{
- static const gchar *thisfn = "nact_sort_buttons_instance_finalize";
- NactSortButtons *self;
+ static const gchar *thisfn = "fma_sort_buttons_instance_finalize";
+ FMASortButtons *self;
- g_return_if_fail( NACT_IS_SORT_BUTTONS( instance ));
+ g_return_if_fail( FMA_IS_SORT_BUTTONS( instance ));
g_debug( "%s: instance=%p (%s)", thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ));
- self = NACT_SORT_BUTTONS( instance );
+ self = FMA_SORT_BUTTONS( instance );
g_free( self->private );
@@ -193,22 +193,22 @@ instance_finalize( GObject *instance )
}
/**
- * nact_sort_buttons_new:
+ * fma_sort_buttons_new:
* @window: the main window.
*
- * Returns: a new #NactSortButtons object.
+ * Returns: a new #FMASortButtons object.
*/
-NactSortButtons *
-nact_sort_buttons_new( FMAMainWindow *window )
+FMASortButtons *
+fma_sort_buttons_new( FMAMainWindow *window )
{
- NactSortButtons *obj;
+ FMASortButtons *obj;
GtkApplication *application;
g_return_val_if_fail( window && FMA_IS_MAIN_WINDOW( window ), NULL );
application = gtk_window_get_application( GTK_WINDOW( window ));
g_return_val_if_fail( application && FMA_IS_APPLICATION( application ), NULL );
- obj = g_object_new( NACT_TYPE_SORT_BUTTONS, NULL );
+ obj = g_object_new( FMA_TYPE_SORT_BUTTONS, NULL );
obj->private->updater = fma_application_get_updater( FMA_APPLICATION( application ));
initialize_buttons( obj, window );
@@ -228,7 +228,7 @@ nact_sort_buttons_new( FMAMainWindow *window )
* - enabled (sensitive) if sort order mode is modifiable.
*/
static void
-initialize_buttons( NactSortButtons *buttons, FMAMainWindow *window )
+initialize_buttons( FMASortButtons *buttons, FMAMainWindow *window )
{
NactTreeView *treeview;
gint i;
@@ -261,9 +261,9 @@ initialize_buttons( NactSortButtons *buttons, FMAMainWindow *window )
* if the user re-clicks on the already active buttons, reset it active
*/
static void
-on_toggle_button_toggled( GtkToggleButton *toggled_button, NactSortButtons *buttons )
+on_toggle_button_toggled( GtkToggleButton *toggled_button, FMASortButtons *buttons )
{
- NactSortButtonsPrivate *priv;
+ FMASortButtonsPrivate *priv;
gint i, ibtn;
priv = buttons->private;
@@ -305,15 +305,15 @@ on_toggle_button_toggled( GtkToggleButton *toggled_button, NactSortButtons *butt
* we already have reset 'toggling' to FALSE when we are coming here
*/
static void
-on_settings_order_mode_changed( const gchar *group, const gchar *key, gconstpointer new_value, gboolean
mandatory, NactSortButtons *sort_buttons )
+on_settings_order_mode_changed( const gchar *group, const gchar *key, gconstpointer new_value, gboolean
mandatory, FMASortButtons *sort_buttons )
{
- static const gchar *thisfn = "nact_sort_buttons_on_settings_order_mode_changed";
- NactSortButtonsPrivate *priv;
+ static const gchar *thisfn = "fma_sort_buttons_on_settings_order_mode_changed";
+ FMASortButtonsPrivate *priv;
const gchar *order_mode_str;
guint order_mode;
gint ibtn;
- g_return_if_fail( NACT_IS_SORT_BUTTONS( sort_buttons ));
+ g_return_if_fail( FMA_IS_SORT_BUTTONS( sort_buttons ));
priv = sort_buttons->private;
@@ -337,10 +337,10 @@ on_settings_order_mode_changed( const gchar *group, const gchar *key, gconstpoin
}
static void
-on_tree_view_count_changed( NactTreeView *treeview, gboolean reset, gint menus_count, gint actions_count,
gint profiles_count, NactSortButtons *buttons )
+on_tree_view_count_changed( NactTreeView *treeview, gboolean reset, gint menus_count, gint actions_count,
gint profiles_count, FMASortButtons *buttons )
{
- static const gchar *thisfn = "nact_sort_buttons_on_tree_view_count_changed";
- NactSortButtonsPrivate *priv;
+ static const gchar *thisfn = "fma_sort_buttons_on_tree_view_count_changed";
+ FMASortButtonsPrivate *priv;
priv = buttons->private;
@@ -361,9 +361,9 @@ on_tree_view_count_changed( NactTreeView *treeview, gboolean reset, gint menus_c
}
static void
-enable_buttons( const NactSortButtons *sort_buttons, gboolean enabled )
+enable_buttons( const FMASortButtons *sort_buttons, gboolean enabled )
{
- NactSortButtonsPrivate *priv;
+ FMASortButtonsPrivate *priv;
gboolean level_zero_writable;
gboolean preferences_locked;
gboolean finally_enabled;
diff --git a/src/ui/nact-sort-buttons.h b/src/ui/fma-sort-buttons.h
similarity index 59%
rename from src/ui/nact-sort-buttons.h
rename to src/ui/fma-sort-buttons.h
index 3081d02..6b88885 100644
--- a/src/ui/nact-sort-buttons.h
+++ b/src/ui/fma-sort-buttons.h
@@ -27,14 +27,14 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __UI_NACT_SORT_BUTTONS_H__
-#define __UI_NACT_SORT_BUTTONS_H__
+#ifndef __UI_FMA_SORT_BUTTONS_H__
+#define __UI_FMA_SORT_BUTTONS_H__
/**
- * SECTION: nact-sort-buttons
- * @title: NactSortButtons
+ * SECTION: fma-sort-buttons
+ * @title: FMASortButtons
* @short_description: The Sort Buttons class definition
- * @include: nact-sort-buttons.h
+ * @include: ui/fma-sort-buttons.h
*
* A convenience class to manager sort buttons in the user interface.
*
@@ -52,32 +52,32 @@
G_BEGIN_DECLS
-#define NACT_TYPE_SORT_BUTTONS ( nact_sort_buttons_get_type())
-#define NACT_SORT_BUTTONS( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_TYPE_SORT_BUTTONS,
NactSortButtons ))
-#define NACT_SORT_BUTTONS_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, NACT_TYPE_SORT_BUTTONS,
NactSortButtonsClass ))
-#define NACT_IS_SORT_BUTTONS( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_TYPE_SORT_BUTTONS ))
-#define NACT_IS_SORT_BUTTONS_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NACT_TYPE_SORT_BUTTONS ))
-#define NACT_SORT_BUTTONS_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ),
NACT_TYPE_SORT_BUTTONS, NactSortButtonsClass ))
+#define FMA_TYPE_SORT_BUTTONS ( fma_sort_buttons_get_type())
+#define FMA_SORT_BUTTONS( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, FMA_TYPE_SORT_BUTTONS,
FMASortButtons ))
+#define FMA_SORT_BUTTONS_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, FMA_TYPE_SORT_BUTTONS,
FMASortButtonsClass ))
+#define FMA_IS_SORT_BUTTONS( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, FMA_TYPE_SORT_BUTTONS ))
+#define FMA_IS_SORT_BUTTONS_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), FMA_TYPE_SORT_BUTTONS ))
+#define FMA_SORT_BUTTONS_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), FMA_TYPE_SORT_BUTTONS,
FMASortButtonsClass ))
-typedef struct _NactSortButtonsPrivate NactSortButtonsPrivate;
+typedef struct _FMASortButtonsPrivate FMASortButtonsPrivate;
typedef struct {
/*< private >*/
- GObject parent;
- NactSortButtonsPrivate *private;
+ GObject parent;
+ FMASortButtonsPrivate *private;
}
- NactSortButtons;
+ FMASortButtons;
typedef struct {
/*< private >*/
- GObjectClass parent;
+ GObjectClass parent;
}
- NactSortButtonsClass;
+ FMASortButtonsClass;
-GType nact_sort_buttons_get_type( void );
+GType fma_sort_buttons_get_type( void );
-NactSortButtons *nact_sort_buttons_new ( FMAMainWindow *window );
+FMASortButtons *fma_sort_buttons_new ( FMAMainWindow *window );
G_END_DECLS
-#endif /* __UI_NACT_SORT_BUTTONS_H__ */
+#endif /* __UI_FMA_SORT_BUTTONS_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]