[nautilus-actions] NADesktopEnv renamed to FMADesktopEnv

[Pierre Wieser <pwieser src gnome org>]

commit c14a36de0daed9c2aeb7213587a757f385adf8c5
Author: Pierre Wieser <pwieser trychlos org>
Date:   Mon Sep 7 23:18:45 2015 +0200

    NADesktopEnv renamed to FMADesktopEnv

 src/core/Makefile.am                               |    4 +-
 ...top-environment.c => fma-desktop-environment.c} |   24 ++++++++++----------
 ...top-environment.h => fma-desktop-environment.h} |   16 ++++++------
 src/core/fma-icontext.c                            |    4 +-
 src/nact/nact-ienvironment-tab.c                   |    6 ++--
 src/nact/nact-preferences-editor.c                 |   20 ++++++++--------
 6 files changed, 37 insertions(+), 37 deletions(-)
---
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index e40d34d..84ae9c1 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -58,8 +58,8 @@ libna_core_la_SOURCES = \
        fma-data-boxed.c                                                                                \
        fma-data-def.c                                                                          \
        fma-data-types.c                                                                                \
-       na-desktop-environment.c                                                        \
-       na-desktop-environment.h                                                        \
+       fma-desktop-environment.c                                                       \
+       fma-desktop-environment.h                                                       \
        na-exporter.c                                                                           \
        na-exporter.h                                                                           \
        na-export-format.c                                                                      \
diff --git a/src/core/na-desktop-environment.c b/src/core/fma-desktop-environment.c
similarity index 88%
rename from src/core/na-desktop-environment.c
rename to src/core/fma-desktop-environment.c
index 2e58005..af52f73 100644
--- a/src/core/na-desktop-environment.c
+++ b/src/core/fma-desktop-environment.c
@@ -33,9 +33,9 @@
 
 #include <glib/gi18n.h>
 
-#include "na-desktop-environment.h"
+#include "fma-desktop-environment.h"
 
-static const NADesktopEnv st_desktops[] = {
+static const FMADesktopEnv st_desktops[] = {
        { DESKTOP_GNOME, N_( "GNOME desktop" ) },
        { DESKTOP_KDE,   N_( "KDE desktop" ) },
        { DESKTOP_LXDE,  N_( "LXDE desktop" ) },
@@ -46,28 +46,28 @@ static const NADesktopEnv st_desktops[] = {
 };
 
 /*
- * na_desktop_environment_get_known_list:
+ * fma_desktop_environment_get_known_list:
  *
  * Returns the list of known desktop environments as defined by the
  * corresponding XDG specification.
  */
-const NADesktopEnv *
-na_desktop_environment_get_known_list( void )
+const FMADesktopEnv *
+fma_desktop_environment_get_known_list( void )
 {
-       return(( const NADesktopEnv * ) st_desktops );
+       return(( const FMADesktopEnv * ) st_desktops );
 }
 
 /*
- * na_desktop_environment_detect_running_desktop:
+ * fma_desktop_environment_detect_running_desktop:
  *
  * Have asked on xdg-list how to identify the currently running desktop environment
  * (see http://standards.freedesktop.org/menu-spec/latest/apb.html)
  * For now, just reproduce the xdg-open algorythm from xdg-utils 1.0
  */
 const gchar *
-na_desktop_environment_detect_running_desktop( void )
+fma_desktop_environment_detect_running_desktop( void )
 {
-       static const gchar *thisfn = "na_desktop_environment_detect_running_desktop";
+       static const gchar *thisfn = "fma_desktop_environment_detect_running_desktop";
        const gchar *value;
        gchar *output_str, *error_str;
        gint exit_status;
@@ -151,7 +151,7 @@ na_desktop_environment_detect_running_desktop( void )
 }
 
 /*
- * na_desktop_environment_get_label:
+ * fma_desktop_environment_get_label:
  * @id: desktop identifier.
  *
  * Returns: the label of the desktop environment.
@@ -162,9 +162,9 @@ na_desktop_environment_detect_running_desktop( void )
  * Since: 3.2
  */
 const gchar *
-na_desktop_environment_get_label( const gchar *id )
+fma_desktop_environment_get_label( const gchar *id )
 {
-       static const gchar *thisfn = "na_desktop_environment_get_label";
+       static const gchar *thisfn = "fma_desktop_environment_get_label";
        int i;
 
        g_return_val_if_fail( id && strlen( id ), NULL );
diff --git a/src/core/na-desktop-environment.h b/src/core/fma-desktop-environment.h
similarity index 83%
rename from src/core/na-desktop-environment.h
rename to src/core/fma-desktop-environment.h
index e22b5a3..370ff66 100644
--- a/src/core/na-desktop-environment.h
+++ b/src/core/fma-desktop-environment.h
@@ -27,12 +27,12 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __CORE_API_NA_DESKTOP_ENVIRONMENT_H__
-#define __CORE_API_NA_DESKTOP_ENVIRONMENT_H__
+#ifndef __CORE_FMA_DESKTOP_ENVIRONMENT_H__
+#define __CORE_FMA_DESKTOP_ENVIRONMENT_H__
 
 /* @title: Desktop Environment
  * @short_description: Desktop Environment Utilities.
- * @include: core/na-desktop-environment.h
+ * @include: core/fma-desktop-environment.h
  *
  * The desktop environment is used with OnlyShowIn and NotShowIn keys of
  * our desktop files. Unfortunately, there is no consensus between desktops
@@ -65,14 +65,14 @@ typedef struct {
        const gchar *id;
        const gchar *label;
 }
-       NADesktopEnv;
+       FMADesktopEnv;
 
-const NADesktopEnv *na_desktop_environment_get_known_list        ( void );
+const FMADesktopEnv *fma_desktop_environment_get_known_list        ( void );
 
-const gchar        *na_desktop_environment_detect_running_desktop( void );
+const gchar         *fma_desktop_environment_detect_running_desktop( void );
 
-const gchar        *na_desktop_environment_get_label             ( const gchar *id );
+const gchar         *fma_desktop_environment_get_label             ( const gchar *id );
 
 G_END_DECLS
 
-#endif /* __CORE_API_NA_DESKTOP_ENVIRONMENT_H__ */
+#endif /* __CORE_FMA_DESKTOP_ENVIRONMENT_H__ */
diff --git a/src/core/fma-icontext.c b/src/core/fma-icontext.c
index 5a59941..7687298 100644
--- a/src/core/fma-icontext.c
+++ b/src/core/fma-icontext.c
@@ -50,7 +50,7 @@
 #include <api/fma-core-utils.h>
 #include <api/fma-object-api.h>
 
-#include "na-desktop-environment.h"
+#include "fma-desktop-environment.h"
 #include "na-gnome-vfs-uri.h"
 #include "na-selected-info.h"
 #include "na-settings.h"
@@ -529,7 +529,7 @@ is_candidate_for_show_in( const FMAIContext *object, guint target, GList *files
        if( !environment ){
                environment = na_settings_get_string( NA_IPREFS_DESKTOP_ENVIRONMENT, NULL, NULL );
                if( !environment || !strlen( environment )){
-                       environment = ( gchar * ) na_desktop_environment_detect_running_desktop();
+                       environment = ( gchar * ) fma_desktop_environment_detect_running_desktop();
                }
                g_debug( "%s: found %s desktop", thisfn, environment );
        }
diff --git a/src/nact/nact-ienvironment-tab.c b/src/nact/nact-ienvironment-tab.c
index ec4df39..fc4c9f7 100644
--- a/src/nact/nact-ienvironment-tab.c
+++ b/src/nact/nact-ienvironment-tab.c
@@ -40,7 +40,7 @@
 #include "api/fma-object-api.h"
 
 #include "core/na-gtk-utils.h"
-#include "core/na-desktop-environment.h"
+#include "core/fma-desktop-environment.h"
 #include "core/na-settings.h"
 
 #include "base-gtk-utils.h"
@@ -261,7 +261,7 @@ initialize_window( NactIEnvironmentTab *instance )
        GtkTreeViewColumn *column;
        GList *renderers;
        guint i;
-       const NADesktopEnv *desktops;
+       const FMADesktopEnv *desktops;
        NactTreeView *tview;
 
        g_return_if_fail( NACT_IS_IENVIRONMENT_TAB( instance ));
@@ -300,7 +300,7 @@ initialize_window( NactIEnvironmentTab *instance )
                                        GTK_CONTAINER( instance ), "EnvironmentsDesktopTreeView" ));
        model = gtk_tree_view_get_model( listview );
 
-       desktops = na_desktop_environment_get_known_list();
+       desktops = fma_desktop_environment_get_known_list();
 
        for( i = 0 ; desktops[i].id ; ++i ){
                gtk_list_store_append( GTK_LIST_STORE( model ), &iter );
diff --git a/src/nact/nact-preferences-editor.c b/src/nact/nact-preferences-editor.c
index 962671a..494a3d9 100644
--- a/src/nact/nact-preferences-editor.c
+++ b/src/nact/nact-preferences-editor.c
@@ -36,7 +36,7 @@
 
 #include <api/fma-iimporter.h>
 
-#include <core/na-desktop-environment.h>
+#include <core/fma-desktop-environment.h>
 #include <core/na-exporter.h>
 #include <core/na-export-format.h>
 #include <core/na-gtk-utils.h>
@@ -116,7 +116,7 @@ enum {
 
 /* i18n: the user is not willing to identify his current desktop environment,
  *       and prefers rely on the runtime detection */
-static const NADesktopEnv st_no_desktop     = { "None", N_( "Rely on runtime detection" ) };
+static const FMADesktopEnv st_no_desktop     = { "None", N_( "Rely on runtime detection" ) };
 
 #define                   st_xmlui_filename   PKGUIDIR "/nact-preferences.ui"
 static const gchar       *st_toplevel_name  = "PreferencesDialog";
@@ -833,7 +833,7 @@ desktop_create_model( NactPreferencesEditor *editor )
        GtkWidget *combo;
        GtkListStore *model;
        GtkCellRenderer *text_cell;
-       const NADesktopEnv *desktops;
+       const FMADesktopEnv *desktops;
        guint i;
        GtkTreeIter row;
 
@@ -865,7 +865,7 @@ desktop_create_model( NactPreferencesEditor *editor )
 
        /* insert list of known desktops
         */
-       desktops = na_desktop_environment_get_known_list();
+       desktops = fma_desktop_environment_get_known_list();
        for( i = 0 ; desktops[i].id ; ++i ){
                gtk_list_store_append( model, &row );
                gtk_list_store_set( model, &row,
@@ -879,7 +879,7 @@ static void
 desktop_setup( NactPreferencesEditor *editor )
 {
        GtkWidget *combo;
-       const NADesktopEnv *desktops;
+       const FMADesktopEnv *desktops;
        guint i;
        gint found;
        GtkWidget *widget;
@@ -890,7 +890,7 @@ desktop_setup( NactPreferencesEditor *editor )
        editor->private->desktop = na_settings_get_string( NA_IPREFS_DESKTOP_ENVIRONMENT, NULL, 
&editor->private->desktop_mandatory );
 
        if( editor->private->desktop && strlen( editor->private->desktop )){
-               desktops = na_desktop_environment_get_known_list();
+               desktops = fma_desktop_environment_get_known_list();
                for( i = 0 ; desktops[i].id && found == -1 ; ++i ){
                        if( !strcmp( desktops[i].id, editor->private->desktop )){
                                found = 1+i;
@@ -916,8 +916,8 @@ desktop_setup( NactPreferencesEditor *editor )
        /* set the currently detected desktop
         */
        widget = base_window_get_widget( BASE_WINDOW( editor ), "DesktopLabel" );
-       desktop_id = na_desktop_environment_detect_running_desktop();
-       desktop_label = na_desktop_environment_get_label( desktop_id );
+       desktop_id = fma_desktop_environment_detect_running_desktop();
+       desktop_label = fma_desktop_environment_get_label( desktop_id );
        gtk_label_set_text( GTK_LABEL( widget ), desktop_label );
 }
 
@@ -926,7 +926,7 @@ desktop_on_changed( GtkComboBox *combo, NactPreferencesEditor *editor )
 {
        gboolean editable;
        gint active;
-       const NADesktopEnv *desktops;
+       const FMADesktopEnv *desktops;
 
        editable = !editor->private->preferences_locked && !editor->private->desktop_mandatory;
 
@@ -936,7 +936,7 @@ desktop_on_changed( GtkComboBox *combo, NactPreferencesEditor *editor )
 
                active = gtk_combo_box_get_active( combo );
                if( active > 0 ){
-                       desktops = na_desktop_environment_get_known_list();
+                       desktops = fma_desktop_environment_get_known_list();
                        editor->private->desktop = g_strdup( desktops[active-1].id );
                }
        }