[Xfce4-commits] <parole:master> Fix spacing in parole-plugins-manager.c
Sean Davis
noreply at xfce.org
Sat Aug 3 13:12:01 CEST 2013
Updating branch refs/heads/master
to 473f3d4abc11dfecc03d1a181827967aaca7d3b1 (commit)
from b740804f795c3cf7d0dc06868f0a9499230324ce (commit)
commit 473f3d4abc11dfecc03d1a181827967aaca7d3b1
Author: Sean Davis <smd.seandavis at gmail.com>
Date: Sat Aug 3 07:10:33 2013 -0400
Fix spacing in parole-plugins-manager.c
src/parole-plugins-manager.c | 583 +++++++++++++++++++++---------------------
1 file changed, 292 insertions(+), 291 deletions(-)
diff --git a/src/parole-plugins-manager.c b/src/parole-plugins-manager.c
index dafceff..7197dcc 100644
--- a/src/parole-plugins-manager.c
+++ b/src/parole-plugins-manager.c
@@ -73,28 +73,28 @@ typedef struct
} PrefData;
-void parole_plugins_manager_pref_response_cb (GtkDialog *dialog,
- gint reponse_id,
- PrefData *pref);
+void parole_plugins_manager_pref_response_cb (GtkDialog *dialog,
+ gint reponse_id,
+ PrefData *pref);
-void parole_plugins_manager_cell_toggled_cb (GtkCellRendererToggle *cell_renderer,
- gchar *path,
- PrefData *pref);
+void parole_plugins_manager_cell_toggled_cb (GtkCellRendererToggle *cell_renderer,
+ gchar *path,
+ PrefData *pref);
-void parole_plugins_manager_tree_cursor_changed_cb (GtkTreeView *view,
- PrefData *pref);
+void parole_plugins_manager_tree_cursor_changed_cb (GtkTreeView *view,
+ PrefData *pref);
-void parole_plugins_manager_show_configure (GtkButton *button,
- PrefData *pref);
+void parole_plugins_manager_show_configure (GtkButton *button,
+ PrefData *pref);
-void parole_plugins_manager_show_about (GtkButton *button,
- PrefData *pref);
+void parole_plugins_manager_show_about (GtkButton *button,
+ PrefData *pref);
-static void parole_plugins_manager_finalize (GObject *object);
-static void parole_plugins_manager_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
+static void parole_plugins_manager_finalize (GObject *object);
+static void parole_plugins_manager_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
#define PAROLE_PLUGINS_MANAGER_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE ((o), PAROLE_TYPE_PLUGINS_MANAGER, ParolePluginsManagerPrivate))
@@ -129,29 +129,29 @@ enum
PROP_LOAD_PLUGIN
};
-void parole_plugins_manager_pref_response_cb (GtkDialog *dialog,
- gint reponse_id,
- PrefData *pref)
+void parole_plugins_manager_pref_response_cb (GtkDialog *dialog,
+ gint reponse_id,
+ PrefData *pref)
{
- GtkTreeIter iter;
- gboolean valid;
+ GtkTreeIter iter;
+ gboolean valid;
for ( valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (pref->store), &iter);
- valid;
- valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (pref->store), &iter) )
+ valid;
+ valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (pref->store), &iter) )
{
- ParolePluginInfo *info;
- gtk_tree_model_get (GTK_TREE_MODEL (pref->store),
- &iter,
- COL_INFO, &info,
- -1);
- g_free (info->name);
- g_free (info->authors);
- g_free (info->website);
- g_free (info->desc);
- g_free (info);
+ ParolePluginInfo *info;
+ gtk_tree_model_get (GTK_TREE_MODEL (pref->store),
+ &iter,
+ COL_INFO, &info,
+ -1);
+ g_free (info->name);
+ g_free (info->authors);
+ g_free (info->website);
+ g_free (info->desc);
+ g_free (info);
}
-
+
gtk_widget_destroy (GTK_WIDGET (dialog));
g_free (pref);
}
@@ -159,7 +159,7 @@ void parole_plugins_manager_pref_response_cb (GtkDialog *dialog,
static void
parole_plugins_manager_get_selected_module_data (PrefData *pref, ParoleProviderModule **module, ParolePluginInfo **info)
{
- GtkTreeModel *model;
+ GtkTreeModel *model;
GtkTreeSelection *sel;
GtkTreeIter iter;
@@ -167,27 +167,27 @@ parole_plugins_manager_get_selected_module_data (PrefData *pref, ParoleProviderM
if ( !gtk_tree_selection_get_selected (sel, &model, &iter))
{
- *module = NULL;
- *info = NULL;
+ *module = NULL;
+ *info = NULL;
return;
}
gtk_tree_model_get (model,
&iter,
COL_MODULE, module,
- COL_INFO, info,
+ COL_INFO, info,
-1);
}
void parole_plugins_manager_show_configure (GtkButton *button, PrefData *pref)
{
ParoleProviderModule *module;
- ParolePluginInfo *info;
-
+ ParolePluginInfo *info;
+
parole_plugins_manager_get_selected_module_data (pref, &module, &info);
-
+
if ( G_UNLIKELY (!module) )
- return;
-
+ return;
+
parole_provider_plugin_configure (PAROLE_PROVIDER_PLUGIN (module), pref->window);
}
@@ -197,39 +197,39 @@ parole_plugins_manager_save_rc (ParolePluginsManager *manager, gchar *filename,
gchar **saved_plugins;
gchar **plugins_rc;
guint num = 0, i, count = 0;
-
+
saved_plugins = parole_conf_read_entry_list (PAROLE_CONF(manager->priv->conf), "plugins");
-
+
if ( saved_plugins )
- num = g_strv_length (saved_plugins);
-
+ num = g_strv_length (saved_plugins);
+
if ( active )
{
plugins_rc = g_new0 (gchar *, num + 2);
-
- for ( i = 0; i < num; i++)
- {
- plugins_rc[i] = g_strdup (saved_plugins[i]);
- }
-
- plugins_rc[num] = g_strdup (filename);
- plugins_rc[num + 1] = NULL;
- parole_conf_write_entry_list (PAROLE_CONF(manager->priv->conf), "plugins", plugins_rc);
+
+ for ( i = 0; i < num; i++)
+ {
+ plugins_rc[i] = g_strdup (saved_plugins[i]);
+ }
+
+ plugins_rc[num] = g_strdup (filename);
+ plugins_rc[num + 1] = NULL;
+ parole_conf_write_entry_list (PAROLE_CONF(manager->priv->conf), "plugins", plugins_rc);
}
else
{
- plugins_rc = g_new0 (gchar *, num + 1);
-
- for ( i = 0; i < num; i++)
- {
- if ( g_strcmp0 (saved_plugins[i], filename) != 0 )
- {
- plugins_rc[count] = g_strdup (saved_plugins[i]);
- count++;
- }
- }
- plugins_rc[num] = NULL;
- parole_conf_write_entry_list (PAROLE_CONF(manager->priv->conf), "plugins", plugins_rc);
+ plugins_rc = g_new0 (gchar *, num + 1);
+
+ for ( i = 0; i < num; i++)
+ {
+ if ( g_strcmp0 (saved_plugins[i], filename) != 0 )
+ {
+ plugins_rc[count] = g_strdup (saved_plugins[i]);
+ count++;
+ }
+ }
+ plugins_rc[num] = NULL;
+ parole_conf_write_entry_list (PAROLE_CONF(manager->priv->conf), "plugins", plugins_rc);
}
g_strfreev (plugins_rc);
g_strfreev (saved_plugins);
@@ -237,8 +237,8 @@ parole_plugins_manager_save_rc (ParolePluginsManager *manager, gchar *filename,
void
parole_plugins_manager_cell_toggled_cb (GtkCellRendererToggle *cell_renderer,
- gchar *path_str,
- PrefData *pref)
+ gchar *path_str,
+ PrefData *pref)
{
ParoleProviderModule *module;
GtkTreeIter iter;
@@ -246,54 +246,54 @@ parole_plugins_manager_cell_toggled_cb (GtkCellRendererToggle *cell_renderer,
gboolean active;
path = gtk_tree_path_new_from_string (path_str);
-
+
gtk_tree_model_get_iter (GTK_TREE_MODEL (pref->store), &iter, path);
-
+
gtk_tree_model_get (GTK_TREE_MODEL (pref->store), &iter,
- COL_ACTIVE, &active,
- COL_MODULE, &module,
- -1);
-
+ COL_ACTIVE, &active,
+ COL_MODULE, &module,
+ -1);
+
active ^= 1;
-
+
if ( pref->manager->priv->load_plugins )
{
- if ( active )
- {
- g_type_module_use (G_TYPE_MODULE (module));
- parole_provider_module_new_plugin (module);
- }
- else
- {
- parole_provider_module_free_plugin (module);
- g_type_module_unuse (G_TYPE_MODULE (module));
- }
+ if ( active )
+ {
+ g_type_module_use (G_TYPE_MODULE (module));
+ parole_provider_module_new_plugin (module);
+ }
+ else
+ {
+ parole_provider_module_free_plugin (module);
+ g_type_module_unuse (G_TYPE_MODULE (module));
+ }
}
-
+
gtk_list_store_set (GTK_LIST_STORE (pref->store), &iter,
- COL_ACTIVE, active,
- -1);
-
+ COL_ACTIVE, active,
+ -1);
+
gtk_tree_path_free (path);
-
+
parole_plugins_manager_save_rc (pref->manager, G_TYPE_MODULE (module)->name, active);
}
void parole_plugins_manager_tree_cursor_changed_cb (GtkTreeView *view,
- PrefData *pref)
+ PrefData *pref)
{
ParoleProviderModule *module;
ParolePluginInfo *info;
gboolean configurable = FALSE;
const gchar *site;
-
+
parole_plugins_manager_get_selected_module_data (pref, &module, &info);
-
+
if ( G_UNLIKELY (!module || !info))
- return;
-
+ return;
+
site = info->website;
-
+
gtk_label_set_markup (GTK_LABEL (pref->desc), info->desc);
gtk_label_set_markup (GTK_LABEL (pref->author), info->authors);
@@ -303,9 +303,9 @@ void parole_plugins_manager_tree_cursor_changed_cb (GtkTreeView *view,
if ( parole_provider_module_get_is_active (module) )
{
- configurable = parole_provider_plugin_get_is_configurable (PAROLE_PROVIDER_PLUGIN (module));
+ configurable = parole_provider_plugin_get_is_configurable (PAROLE_PROVIDER_PLUGIN (module));
}
-
+
gtk_widget_set_sensitive (pref->configure, configurable);
}
@@ -313,12 +313,12 @@ static void
parole_plugins_manager_unload_all (gpointer data, gpointer user_data)
{
ParoleProviderModule *module;
-
+
module = PAROLE_PROVIDER_MODULE (data);
if ( parole_provider_module_get_is_active (module) )
{
- parole_provider_module_free_plugin (module);
- g_type_module_unuse (G_TYPE_MODULE (data));
+ parole_provider_module_free_plugin (module);
+ g_type_module_unuse (G_TYPE_MODULE (data));
}
//g_object_unref (module);
}
@@ -329,47 +329,47 @@ parole_plugins_manager_get_plugin_info (const gchar *desktop_file)
ParolePluginInfo *info;
GKeyFile *file;
GError *error = NULL;
-
+
info = g_new0 (ParolePluginInfo, 1);
-
+
info->name = NULL;
info->website = NULL;
info->desc = NULL;
info->authors = NULL;
-
+
file = g_key_file_new ();
-
+
if ( !g_key_file_load_from_file (file, desktop_file , G_KEY_FILE_NONE, &error) )
{
- g_warning ("Error opening file : %s : %s", desktop_file, error->message);
- g_error_free (error);
- goto out;
+ g_warning ("Error opening file : %s : %s", desktop_file, error->message);
+ g_error_free (error);
+ goto out;
}
-
+
info->name = g_key_file_get_locale_string (file, "Parole Plugin", "Name", NULL, NULL);
-
+
if ( !info->name )
- info->name = g_strdup (_("Unknown"));
-
-
+ info->name = g_strdup (_("Unknown"));
+
+
info->desc = g_key_file_get_locale_string (file, "Parole Plugin", "Description", NULL, NULL);
-
+
if ( !info->desc )
- info->desc = g_strdup ("");
-
+ info->desc = g_strdup ("");
+
info->authors = g_key_file_get_string (file, "Parole Plugin", "Authors", NULL);
-
+
if ( !info->authors )
- info->authors = g_strdup ("");
-
+ info->authors = g_strdup ("");
+
info->website = g_key_file_get_string (file, "Parole Plugin", "Website", NULL);
-
+
if ( !info->website )
- info->website = g_strdup ("");
-
+ info->website = g_strdup ("");
+
out:
g_key_file_free (file);
-
+
return info;
}
@@ -381,56 +381,56 @@ parole_plugins_manager_show_plugins_pref (GtkWidget *widget, ParolePluginsManage
GtkTreePath *path;
GtkTreeIter iter;
guint i;
-
+
PrefData *pref;
-
+
/*No plugins found*/
if ( manager->priv->array->len == 0 )
{
- parole_dialog_info (GTK_WINDOW (gtk_widget_get_toplevel (manager->priv->main_nt)),
- _("No installed plugins found on this system"),
- _("No installed plugins found on this system"));
- return;
+ parole_dialog_info (GTK_WINDOW (gtk_widget_get_toplevel (manager->priv->main_nt)),
+ _("No installed plugins found on this system"),
+ _("No installed plugins found on this system"));
+ return;
}
-
+
builder = parole_builder_new_from_string (plugins_ui, plugins_ui_length);
-
+
pref = g_new0 (PrefData, 1);
-
+
pref->window = GTK_WIDGET (gtk_builder_get_object (builder, "dialog"));
pref->view = GTK_WIDGET (gtk_builder_get_object (builder, "treeview"));
-
+
pref->manager = manager;
pref->store = GTK_LIST_STORE (gtk_builder_get_object (builder, "liststore"));
-
+
pref->desc = GTK_WIDGET (gtk_builder_get_object (builder, "description"));
pref->author = GTK_WIDGET (gtk_builder_get_object (builder, "author"));
pref->site = GTK_WIDGET (gtk_builder_get_object (builder, "sitebutton"));
pref->configure = GTK_WIDGET (gtk_builder_get_object (builder, "configure"));
-
+
gtk_window_set_transient_for (GTK_WINDOW (pref->window),
- GTK_WINDOW (gtk_widget_get_toplevel (manager->priv->main_nt)));
+ GTK_WINDOW (gtk_widget_get_toplevel (manager->priv->main_nt)));
for ( i = 0; i < manager->priv->array->len; i++)
{
- ParoleProviderModule *module;
- ParolePluginInfo *info;
- module = g_ptr_array_index (manager->priv->array, i);
-
- info = parole_plugins_manager_get_plugin_info (module->desktop_file);
-
- gtk_list_store_append (pref->store, &iter);
- gtk_list_store_set (pref->store, &iter,
- COL_ACTIVE, parole_provider_module_get_is_active (module),
- COL_PLUGIN, info->name,
- COL_MODULE, module,
- COL_INFO, info,
- -1);
+ ParoleProviderModule *module;
+ ParolePluginInfo *info;
+ module = g_ptr_array_index (manager->priv->array, i);
+
+ info = parole_plugins_manager_get_plugin_info (module->desktop_file);
+
+ gtk_list_store_append (pref->store, &iter);
+ gtk_list_store_set (pref->store, &iter,
+ COL_ACTIVE, parole_provider_module_get_is_active (module),
+ COL_PLUGIN, info->name,
+ COL_MODULE, module,
+ COL_INFO, info,
+ -1);
}
-
+
gtk_builder_connect_signals (builder, pref);
g_object_unref (builder);
-
+
sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (pref->view));
path = gtk_tree_path_new_from_string ("0");
@@ -438,7 +438,7 @@ parole_plugins_manager_show_plugins_pref (GtkWidget *widget, ParolePluginsManage
gtk_tree_selection_select_path (sel, path);
gtk_tree_view_set_cursor (GTK_TREE_VIEW (pref->view), path, NULL, FALSE);
gtk_tree_path_free (path);
-
+
gtk_widget_show_all (pref->window);
}
@@ -462,43 +462,43 @@ parole_plugins_manager_page_removed_cb (GtkContainer *container, GtkWidget *widg
parole_plugins_manager_set_show_tabs (GTK_NOTEBOOK (container));
}
-static void parole_plugins_manager_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
+static void parole_plugins_manager_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
ParolePluginsManager *manager;
-
+
manager = PAROLE_PLUGINS_MANAGER (object);
-
+
switch (prop_id)
{
- case PROP_LOAD_PLUGIN:
- manager->priv->load_plugins = g_value_get_boolean (value);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
+ case PROP_LOAD_PLUGIN:
+ manager->priv->load_plugins = g_value_get_boolean (value);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
}
}
-static void parole_plugins_manager_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
+static void parole_plugins_manager_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
{
ParolePluginsManager *manager;
-
+
manager = PAROLE_PLUGINS_MANAGER (object);
-
+
switch (prop_id)
{
- case PROP_LOAD_PLUGIN:
- g_value_set_boolean (value, manager->priv->load_plugins);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
+ case PROP_LOAD_PLUGIN:
+ g_value_set_boolean (value, manager->priv->load_plugins);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
}
}
@@ -511,20 +511,21 @@ parole_plugins_manager_get_module_name (const gchar *desktop_file)
gchar *library_name = NULL;
file = g_key_file_new ();
-
+
if ( !g_key_file_load_from_file (file, desktop_file, G_KEY_FILE_NONE, &error) )
{
- g_warning ("Error opening file : %s : %s", desktop_file, error->message);
- g_error_free (error);
- goto out;
+ g_warning ("Error opening file : %s : %s", desktop_file, error->message);
+ g_error_free (error);
+ goto out;
}
-
+
module_name = g_key_file_get_string (file, "Parole Plugin", "Module", NULL);
library_name = g_strdup_printf ("%s.%s", module_name, G_MODULE_SUFFIX);
g_free (module_name);
+
out:
g_key_file_free (file);
-
+
return library_name;
}
@@ -533,35 +534,35 @@ parole_plugins_manager_load_plugins (ParolePluginsManager *manager)
{
gchar **plugins_rc;
guint len = 0, i, j;
-
+
plugins_rc = parole_conf_read_entry_list (PAROLE_CONF(manager->priv->conf), "plugins");
-
+
if ( plugins_rc && plugins_rc[0] )
- len = g_strv_length (plugins_rc);
+ len = g_strv_length (plugins_rc);
for ( j = 0; j < manager->priv->array->len; j++)
{
- GTypeModule *module;
- module = g_ptr_array_index (manager->priv->array, j);
-
- for ( i = 0; i < len; i++)
- {
- if ( !g_strcmp0 (plugins_rc[i], module->name) )
- {
- TRACE ("Loading plugin :%s", module->name);
- if ( !g_type_module_use (module) )
- {
- parole_plugins_manager_save_rc (manager, module->name, FALSE);
- g_ptr_array_remove (manager->priv->array, module);
- g_object_unref (module);
- }
- else
- {
- parole_provider_module_new_plugin (PAROLE_PROVIDER_MODULE (module));
- }
- break;
- }
- }
+ GTypeModule *module;
+ module = g_ptr_array_index (manager->priv->array, j);
+
+ for ( i = 0; i < len; i++)
+ {
+ if ( !g_strcmp0 (plugins_rc[i], module->name) )
+ {
+ TRACE ("Loading plugin :%s", module->name);
+ if ( !g_type_module_use (module) )
+ {
+ parole_plugins_manager_save_rc (manager, module->name, FALSE);
+ g_ptr_array_remove (manager->priv->array, module);
+ g_object_unref (module);
+ }
+ else
+ {
+ parole_provider_module_new_plugin (PAROLE_PROVIDER_MODULE (module));
+ }
+ break;
+ }
+ }
}
}
@@ -573,15 +574,15 @@ parole_plugins_manager_class_init (ParolePluginsManagerClass *klass)
object_class->finalize = parole_plugins_manager_finalize;
object_class->set_property = parole_plugins_manager_set_property;
object_class->get_property = parole_plugins_manager_get_property;
-
-
- g_object_class_install_property (object_class,
- PROP_LOAD_PLUGIN,
- g_param_spec_boolean ("load-plugins",
- NULL, NULL,
- TRUE,
- G_PARAM_CONSTRUCT_ONLY|
- G_PARAM_READWRITE));
+
+
+ g_object_class_install_property (object_class,
+ PROP_LOAD_PLUGIN,
+ g_param_spec_boolean ("load-plugins",
+ NULL, NULL,
+ TRUE,
+ G_PARAM_CONSTRUCT_ONLY|
+ G_PARAM_READWRITE));
g_type_class_add_private (klass, sizeof (ParolePluginsManagerPrivate));
}
@@ -590,38 +591,38 @@ static void
parole_plugins_manager_init (ParolePluginsManager *manager)
{
GtkBuilder *builder;
-
+
manager->priv = PAROLE_PLUGINS_MANAGER_GET_PRIVATE (manager);
-
+
manager->priv->array = g_ptr_array_new ();
-
+
builder = parole_builder_get_main_interface ();
-
+
manager->priv->load_plugins = TRUE;
-
+
manager->priv->list_nt = GTK_WIDGET (gtk_builder_get_object (builder, "notebook-playlist"));
manager->priv->main_nt = GTK_WIDGET (gtk_builder_get_object (builder, "main-notebook"));
-
+
manager->priv->conf = parole_conf_new();
-
- g_signal_connect (manager->priv->list_nt, "page-added",
- G_CALLBACK (parole_plugins_manager_page_added_cb), NULL);
-
- g_signal_connect (manager->priv->list_nt, "page-removed",
- G_CALLBACK (parole_plugins_manager_page_removed_cb), NULL);
-
- g_signal_connect (manager->priv->main_nt, "page-added",
- G_CALLBACK (parole_plugins_manager_page_added_cb), NULL);
-
- g_signal_connect (manager->priv->main_nt, "page-removed",
- G_CALLBACK (parole_plugins_manager_page_removed_cb), NULL);
-
- g_signal_connect (gtk_builder_get_object (builder, "plugins-menu-item"), "activate",
- G_CALLBACK (parole_plugins_manager_show_plugins_pref), manager);
-
+
+ g_signal_connect (manager->priv->list_nt, "page-added",
+ G_CALLBACK (parole_plugins_manager_page_added_cb), NULL);
+
+ g_signal_connect (manager->priv->list_nt, "page-removed",
+ G_CALLBACK (parole_plugins_manager_page_removed_cb), NULL);
+
+ g_signal_connect (manager->priv->main_nt, "page-added",
+ G_CALLBACK (parole_plugins_manager_page_added_cb), NULL);
+
+ g_signal_connect (manager->priv->main_nt, "page-removed",
+ G_CALLBACK (parole_plugins_manager_page_removed_cb), NULL);
+
+ g_signal_connect (gtk_builder_get_object (builder, "plugins-menu-item"), "activate",
+ G_CALLBACK (parole_plugins_manager_show_plugins_pref), manager);
+
parole_plugins_manager_set_show_tabs (GTK_NOTEBOOK (manager->priv->list_nt));
parole_plugins_manager_set_show_tabs (GTK_NOTEBOOK (manager->priv->main_nt));
-
+
g_object_unref (builder);
}
@@ -631,9 +632,9 @@ parole_plugins_manager_finalize (GObject *object)
ParolePluginsManager *manager;
manager = PAROLE_PLUGINS_MANAGER (object);
-
- g_ptr_array_foreach (manager->priv->array,
- (GFunc)parole_plugins_manager_unload_all, NULL);
+
+ g_ptr_array_foreach (manager->priv->array,
+ (GFunc)parole_plugins_manager_unload_all, NULL);
g_ptr_array_free (manager->priv->array, TRUE);
G_OBJECT_CLASS (parole_plugins_manager_parent_class)->finalize (object);
@@ -644,16 +645,16 @@ parole_plugins_manager_new (gboolean load_plugins)
{
if ( G_LIKELY (parole_plugins_manager_object != NULL) )
{
- g_object_ref (parole_plugins_manager_object);
+ g_object_ref (parole_plugins_manager_object);
}
else
{
- parole_plugins_manager_object = g_object_new (PAROLE_TYPE_PLUGINS_MANAGER,
- "load-plugins", load_plugins,
- NULL);
- g_object_add_weak_pointer (parole_plugins_manager_object, &parole_plugins_manager_object);
+ parole_plugins_manager_object = g_object_new (PAROLE_TYPE_PLUGINS_MANAGER,
+ "load-plugins", load_plugins,
+ NULL);
+ g_object_add_weak_pointer (parole_plugins_manager_object, &parole_plugins_manager_object);
}
-
+
return PAROLE_PLUGINS_MANAGER (parole_plugins_manager_object);
}
@@ -661,8 +662,8 @@ ParolePluginsManager *
parole_plugins_manager_get (void)
{
if ( G_UNLIKELY (parole_plugins_manager_object == NULL ) )
- g_error ("Plugins Manager is NULL");
-
+ g_error ("Plugins Manager is NULL");
+
return PAROLE_PLUGINS_MANAGER (parole_plugins_manager_object);
}
@@ -671,50 +672,50 @@ void parole_plugins_manager_load (ParolePluginsManager *manager)
GDir *dir;
GError *error = NULL;
const gchar *name;
-
+
dir = g_dir_open (PAROLE_PLUGINS_DATA_DIR, 0, &error);
-
+
if ( error )
{
- g_debug ("No installed plugins found");
- g_error_free (error);
- return;
+ g_debug ("No installed plugins found");
+ g_error_free (error);
+ return;
}
-
+
while ( (name = g_dir_read_name (dir) ))
{
- gchar *library_name;
- gchar *desktop_file;
-
- desktop_file = g_build_filename (PAROLE_PLUGINS_DATA_DIR, name, NULL);
- library_name = parole_plugins_manager_get_module_name (desktop_file);
-
- if ( library_name )
- {
- ParoleProviderModule *module;
- gchar *library_path;
-
- library_path = g_build_filename (PAROLE_PLUGINS_DIR, library_name, NULL);
- if ( !g_file_test (library_path, G_FILE_TEST_EXISTS) )
- {
- g_debug ("Desktop file found '%s' but no plugin installed", library_path);
- g_free (library_path);
- continue;
- }
- TRACE ("Creating a module for %s desktop file %s", library_path, desktop_file);
- module = parole_provider_module_new (library_path, desktop_file);
- g_ptr_array_add (manager->priv->array, module);
-
- g_free (library_name);
- g_free (library_path);
- }
- g_free (desktop_file);
+ gchar *library_name;
+ gchar *desktop_file;
+
+ desktop_file = g_build_filename (PAROLE_PLUGINS_DATA_DIR, name, NULL);
+ library_name = parole_plugins_manager_get_module_name (desktop_file);
+
+ if ( library_name )
+ {
+ ParoleProviderModule *module;
+ gchar *library_path;
+
+ library_path = g_build_filename (PAROLE_PLUGINS_DIR, library_name, NULL);
+ if ( !g_file_test (library_path, G_FILE_TEST_EXISTS) )
+ {
+ g_debug ("Desktop file found '%s' but no plugin installed", library_path);
+ g_free (library_path);
+ continue;
+ }
+ TRACE ("Creating a module for %s desktop file %s", library_path, desktop_file);
+ module = parole_provider_module_new (library_path, desktop_file);
+ g_ptr_array_add (manager->priv->array, module);
+
+ g_free (library_name);
+ g_free (library_path);
+ }
+ g_free (desktop_file);
}
g_dir_close (dir);
-
+
if ( manager->priv->load_plugins )
- parole_plugins_manager_load_plugins (manager);
-
+ parole_plugins_manager_load_plugins (manager);
+
}
void
@@ -722,12 +723,12 @@ parole_plugins_manager_pack (ParolePluginsManager *manager, GtkWidget *widget, c
{
if ( container == PAROLE_PLUGIN_CONTAINER_PLAYLIST )
{
- gtk_notebook_append_page (GTK_NOTEBOOK (manager->priv->list_nt), widget, gtk_label_new (title));
- gtk_widget_show_all (widget);
+ gtk_notebook_append_page (GTK_NOTEBOOK (manager->priv->list_nt), widget, gtk_label_new (title));
+ gtk_widget_show_all (widget);
}
else if ( container == PAROLE_PLUGIN_CONTAINER_MAIN_VIEW )
{
- gtk_notebook_append_page (GTK_NOTEBOOK (manager->priv->main_nt), widget, gtk_label_new (title));
- gtk_widget_show_all (widget);
+ gtk_notebook_append_page (GTK_NOTEBOOK (manager->priv->main_nt), widget, gtk_label_new (title));
+ gtk_widget_show_all (widget);
}
}
More information about the Xfce4-commits
mailing list