[gtranslator] Re-indent files in plugins folder
- From: Pablo Sanxiao Roca <psanxiao src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gtranslator] Re-indent files in plugins folder
- Date: Mon, 8 Feb 2010 22:32:44 +0000 (UTC)
commit 3daddbcbd069271535de4df7891ab61cd7960310
Author: Pablo Sanxiao <psanxiao gnome org>
Date: Mon Feb 8 23:31:21 2010 +0100
Re-indent files in plugins folder
.../gtr-alternate-language-panel.c | 103 ++++-----
.../gtr-alternate-language-panel.h | 9 +-
.../gtr-alternate-language-plugin.c | 74 +++---
.../gtr-alternate-language-plugin.h | 6 +-
plugins/charmap/gtr-charmap-panel.c | 29 +--
plugins/charmap/gtr-charmap-panel.h | 8 +-
plugins/charmap/gtr-charmap-plugin.c | 85 +++----
plugins/charmap/gtr-charmap-plugin.h | 3 +-
plugins/dictionary/gtr-dict-panel.c | 254 +++++++++-----------
plugins/dictionary/gtr-dict-panel.h | 3 +-
plugins/dictionary/gtr-dictionary-plugin.c | 23 +-
plugins/dictionary/gtr-gdict-sidebar.c | 90 ++++----
plugins/dictionary/gtr-gdict-sidebar.h | 14 +-
plugins/fullscreen/gtr-fullscreen-plugin.c | 33 +--
plugins/fullscreen/gtr-fullscreen-plugin.h | 6 +-
plugins/glossary/glossary-panel.c | 11 +-
plugins/glossary/glossary-panel.h | 3 +-
plugins/insert-params/gtr-insert-params-plugin.c | 92 ++++----
plugins/insert-params/gtr-insert-params-plugin.h | 6 +-
plugins/insert-tags/gtr-insert-tags-plugin.c | 54 ++---
plugins/insert-tags/gtr-insert-tags-plugin.h | 6 +-
plugins/open-tran/gtr-open-tran-panel.c | 156 ++++++------
plugins/open-tran/gtr-open-tran-panel.h | 3 +-
plugins/open-tran/gtr-open-tran-plugin.c | 82 +++----
plugins/open-tran/gtr-open-tran-plugin.h | 3 +-
.../source-code-view/gtr-source-code-view-plugin.c | 235 +++++++++----------
.../source-code-view/gtr-source-code-view-plugin.h | 9 +-
plugins/source-code-view/gtr-viewer.c | 111 +++++-----
plugins/source-code-view/gtr-viewer.h | 3 +-
29 files changed, 706 insertions(+), 808 deletions(-)
---
diff --git a/plugins/alternate-language/gtr-alternate-language-panel.c b/plugins/alternate-language/gtr-alternate-language-panel.c
index b73108e..ae951bf 100644
--- a/plugins/alternate-language/gtr-alternate-language-panel.c
+++ b/plugins/alternate-language/gtr-alternate-language-panel.c
@@ -42,7 +42,7 @@
GtrAlternateLangPanelPrivate))
GTR_PLUGIN_DEFINE_TYPE (GtrAlternateLangPanel,
- gtr_alternate_lang_panel, GTK_TYPE_VBOX)
+ gtr_alternate_lang_panel, GTK_TYPE_VBOX)
struct _GtrAlternateLangPanelPrivate
{
GtkWidget *open_button;
@@ -86,29 +86,28 @@ search_message (GtrAlternateLangPanel * panel, GtrMsg * msg)
string = gtr_msg_get_msgid (l->data);
string_collate = g_utf8_collate_key (string, -1);
if (strcmp (string_collate, msgid_collate) == 0)
- {
- gtr_alternate_lang_panel_set_text (panel,
- gtr_msg_get_msgstr
- (l->data));
- status = gtr_msg_get_status (GTR_MSG (l->data));
- switch (status)
- {
- case GTR_MSG_STATUS_TRANSLATED:
- gtk_image_clear (GTK_IMAGE (panel->priv->status));
- break;
- case GTR_MSG_STATUS_FUZZY:
- gtk_image_set_from_stock (GTK_IMAGE (panel->priv->status),
- FUZZY_ICON,
- GTK_ICON_SIZE_SMALL_TOOLBAR);
- break;
- default:
- break;
- }
-
- g_free (string_collate);
- g_free (msgid_collate);
- return;
- }
+ {
+ gtr_alternate_lang_panel_set_text (panel,
+ gtr_msg_get_msgstr (l->data));
+ status = gtr_msg_get_status (GTR_MSG (l->data));
+ switch (status)
+ {
+ case GTR_MSG_STATUS_TRANSLATED:
+ gtk_image_clear (GTK_IMAGE (panel->priv->status));
+ break;
+ case GTR_MSG_STATUS_FUZZY:
+ gtk_image_set_from_stock (GTK_IMAGE (panel->priv->status),
+ FUZZY_ICON,
+ GTK_ICON_SIZE_SMALL_TOOLBAR);
+ break;
+ default:
+ break;
+ }
+
+ g_free (string_collate);
+ g_free (msgid_collate);
+ return;
+ }
g_free (string_collate);
}
while ((l = g_list_next (l)));
@@ -120,13 +119,11 @@ search_message (GtrAlternateLangPanel * panel, GtrMsg * msg)
* If we are here the status is untranslated
*/
gtk_image_set_from_stock (GTK_IMAGE (panel->priv->status),
- UNTRANSLATED_ICON, GTK_ICON_SIZE_SMALL_TOOLBAR);
+ UNTRANSLATED_ICON, GTK_ICON_SIZE_SMALL_TOOLBAR);
}
static void
-showed_message_cb (GtrTab * tab,
- GtrMsg * msg,
- GtrAlternateLangPanel * panel)
+showed_message_cb (GtrTab * tab, GtrMsg * msg, GtrAlternateLangPanel * panel)
{
if (panel->priv->po == NULL)
{
@@ -158,10 +155,10 @@ open_file (GtkWidget * dialog, GtrAlternateLangPanel * panel)
* FIXME: We have to get the window
*/
erdialog = gtk_message_dialog_new (NULL,
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_CLOSE,
- "%s", error->message);
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_CLOSE,
+ "%s", error->message);
gtk_dialog_run (GTK_DIALOG (erdialog));
gtk_widget_destroy (erdialog);
g_error_free (error);
@@ -175,8 +172,7 @@ open_file (GtkWidget * dialog, GtrAlternateLangPanel * panel)
static void
-gtr_file_chooser_analyse (gpointer dialog,
- GtrAlternateLangPanel * panel)
+gtr_file_chooser_analyse (gpointer dialog, GtrAlternateLangPanel * panel)
{
gint reply;
@@ -199,7 +195,7 @@ gtr_file_chooser_analyse (gpointer dialog,
static void
open_button_clicked_cb (GtkWidget * open_button,
- GtrAlternateLangPanel * panel)
+ GtrAlternateLangPanel * panel)
{
GtkWidget *dialog = NULL;
gchar *dir;
@@ -216,10 +212,8 @@ open_button_clicked_cb (GtkWidget * open_button,
* I need a way here to get the window
*/
dialog = gtr_file_chooser_new (NULL,
- FILESEL_OPEN,
- _
- ("Open file for alternate language"),
- NULL);
+ FILESEL_OPEN,
+ _("Open file for alternate language"), NULL);
tab_po = gtr_tab_get_po (panel->priv->tab);
location = gtr_po_get_location (tab_po);
@@ -239,7 +233,7 @@ open_button_clicked_cb (GtkWidget * open_button,
static void
close_button_clicked_cb (GtkWidget * close_button,
- GtrAlternateLangPanel * panel)
+ GtrAlternateLangPanel * panel)
{
if (panel->priv->po != NULL)
{
@@ -276,18 +270,18 @@ gtr_alternate_lang_panel_draw (GtrAlternateLangPanel * panel)
panel->priv->open_button = gtk_button_new_from_stock (GTK_STOCK_OPEN);
g_signal_connect (panel->priv->open_button,
- "clicked", G_CALLBACK (open_button_clicked_cb), panel);
+ "clicked", G_CALLBACK (open_button_clicked_cb), panel);
gtk_widget_show (panel->priv->open_button);
panel->priv->close_button = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
g_signal_connect (panel->priv->close_button,
- "clicked", G_CALLBACK (close_button_clicked_cb), panel);
+ "clicked", G_CALLBACK (close_button_clicked_cb), panel);
gtk_widget_show (panel->priv->close_button);
gtk_box_pack_start (GTK_BOX (buttonbox),
- panel->priv->open_button, TRUE, TRUE, 0);
+ panel->priv->open_button, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (buttonbox),
- panel->priv->close_button, TRUE, TRUE, 0);
+ panel->priv->close_button, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (hbox), buttonbox, FALSE, TRUE, 0);
@@ -307,21 +301,19 @@ gtr_alternate_lang_panel_draw (GtrAlternateLangPanel * panel)
panel->priv->textview = gtr_view_new ();
gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (panel->priv->textview),
- GTK_WRAP_WORD);
+ GTK_WRAP_WORD);
gtk_text_view_set_editable (GTK_TEXT_VIEW (panel->priv->textview), FALSE);
- gtr_alternate_lang_panel_set_text (panel,
- _
- ("There isn't any file loaded"));
+ gtr_alternate_lang_panel_set_text (panel, _("There isn't any file loaded"));
gtk_widget_set_sensitive (panel->priv->textview, FALSE);
gtk_widget_show (panel->priv->textview);
gtk_container_add (GTK_CONTAINER (scroll), panel->priv->textview);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scroll),
- GTK_SHADOW_IN);
+ GTK_SHADOW_IN);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll),
- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_box_pack_start (GTK_BOX (panel), scroll, TRUE, TRUE, 0);
}
@@ -339,18 +331,15 @@ gtr_alternate_lang_panel_init (GtrAlternateLangPanel * panel)
static void
gtr_alternate_lang_panel_finalize (GObject * object)
{
- G_OBJECT_CLASS (gtr_alternate_lang_panel_parent_class)->
- finalize (object);
+ G_OBJECT_CLASS (gtr_alternate_lang_panel_parent_class)->finalize (object);
}
static void
-gtr_alternate_lang_panel_class_init
- (GtrAlternateLangPanelClass * klass)
+ gtr_alternate_lang_panel_class_init (GtrAlternateLangPanelClass * klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- g_type_class_add_private (klass,
- sizeof (GtrAlternateLangPanelPrivate));
+ g_type_class_add_private (klass, sizeof (GtrAlternateLangPanelPrivate));
object_class->finalize = gtr_alternate_lang_panel_finalize;
}
@@ -366,7 +355,7 @@ gtr_alternate_lang_panel_new (GtkWidget * tab)
panel->priv->tab = GTR_TAB (tab);
g_signal_connect (tab, "showed-message",
- G_CALLBACK (showed_message_cb), panel);
+ G_CALLBACK (showed_message_cb), panel);
return GTK_WIDGET (panel);
}
diff --git a/plugins/alternate-language/gtr-alternate-language-panel.h b/plugins/alternate-language/gtr-alternate-language-panel.h
index 2efb650..f185c86 100644
--- a/plugins/alternate-language/gtr-alternate-language-panel.h
+++ b/plugins/alternate-language/gtr-alternate-language-panel.h
@@ -33,8 +33,7 @@ G_BEGIN_DECLS
#define GTR_IS_ALTERNATE_LANG_PANEL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_ALTERNATE_LANG_PANEL))
#define GTR_ALTERNATE_LANG_PANEL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_ALTERNATE_LANG_PANEL, GtrAlternateLangPanelClass))
/* Private structure type */
-typedef struct _GtrAlternateLangPanelPrivate
- GtrAlternateLangPanelPrivate;
+typedef struct _GtrAlternateLangPanelPrivate GtrAlternateLangPanelPrivate;
/*
* Main object structure
@@ -52,8 +51,7 @@ struct _GtrAlternateLangPanel
/*
* Class definition
*/
-typedef struct _GtrAlternateLangPanelClass
- GtrAlternateLangPanelClass;
+typedef struct _GtrAlternateLangPanelClass GtrAlternateLangPanelClass;
struct _GtrAlternateLangPanelClass
{
@@ -66,8 +64,7 @@ struct _GtrAlternateLangPanelClass
GType
gtr_alternate_lang_panel_get_type (void)
G_GNUC_CONST;
- GType gtr_alternate_lang_panel_register_type (GTypeModule *
- module);
+ GType gtr_alternate_lang_panel_register_type (GTypeModule * module);
GtkWidget *gtr_alternate_lang_panel_new (GtkWidget * tab);
G_END_DECLS
diff --git a/plugins/alternate-language/gtr-alternate-language-plugin.c b/plugins/alternate-language/gtr-alternate-language-plugin.c
index 677e5f2..4b810c1 100644
--- a/plugins/alternate-language/gtr-alternate-language-plugin.c
+++ b/plugins/alternate-language/gtr-alternate-language-plugin.c
@@ -37,11 +37,12 @@
GtrAlternateLangPluginPrivate))
GTR_PLUGIN_REGISTER_TYPE_WITH_CODE (GtrAlternateLangPlugin,
- gtr_alternate_lang_plugin,
- gtr_alternate_lang_panel_register_type
- (module);)
+ gtr_alternate_lang_plugin,
+ gtr_alternate_lang_panel_register_type
+ (module);
+ )
static void on_alternate_lang_activated (GtkAction * action,
- GtrWindow * window)
+ GtrWindow * window)
{
GtrTab *tab;
GtkWidget *alternatelang;
@@ -85,24 +86,21 @@ update_ui_real (GtrWindow * window, WindowData * data)
}
static void
-gtr_alternate_lang_plugin_init (GtrAlternateLangPlugin *
- message_table)
+gtr_alternate_lang_plugin_init (GtrAlternateLangPlugin * message_table)
{
}
static void
gtr_alternate_lang_plugin_finalize (GObject * object)
{
- G_OBJECT_CLASS (gtr_alternate_lang_plugin_parent_class)->
- finalize (object);
+ G_OBJECT_CLASS (gtr_alternate_lang_plugin_parent_class)->finalize (object);
}
static void
create_alternate_lang_plugin_panel (GtkNotebook * notebook,
- GtkWidget * child,
- guint page_num,
- GtrWindow * window)
+ GtkWidget * child,
+ guint page_num, GtrWindow * window)
{
GtkWidget *alternatelang;
GtrPo *po;
@@ -115,8 +113,8 @@ create_alternate_lang_plugin_panel (GtkNotebook * notebook,
gtk_widget_show (alternatelang);
gtr_tab_add_widget_to_lateral_panel (GTR_TAB (child),
- alternatelang,
- _("Alternate Language"));
+ alternatelang,
+ _("Alternate Language"));
g_object_set_data (G_OBJECT (child), TAB_DATA_KEY, alternatelang);
}
@@ -133,32 +131,31 @@ impl_activate (GtrPlugin * plugin, GtrWindow * window)
manager = gtr_window_get_ui_manager (window);
- data->action_group =
- gtk_action_group_new ("GtrAlternateLangPluginActions");
+ data->action_group = gtk_action_group_new ("GtrAlternateLangPluginActions");
gtk_action_group_set_translation_domain (data->action_group,
- GETTEXT_PACKAGE);
+ GETTEXT_PACKAGE);
gtk_action_group_add_actions (data->action_group, action_entries,
- G_N_ELEMENTS (action_entries), window);
+ G_N_ELEMENTS (action_entries), window);
gtk_ui_manager_insert_action_group (manager, data->action_group, -1);
data->ui_id = gtk_ui_manager_new_merge_id (manager);
g_object_set_data_full (G_OBJECT (window),
- WINDOW_DATA_KEY,
- data, (GDestroyNotify) free_window_data);
+ WINDOW_DATA_KEY,
+ data, (GDestroyNotify) free_window_data);
gtk_ui_manager_add_ui (manager,
- data->ui_id,
- MENU_PATH,
- "AlternateLang",
- "AlternateLang", GTK_UI_MANAGER_MENUITEM, FALSE);
+ data->ui_id,
+ MENU_PATH,
+ "AlternateLang",
+ "AlternateLang", GTK_UI_MANAGER_MENUITEM, FALSE);
notebook = gtr_window_get_notebook (window);
g_signal_connect (GTK_NOTEBOOK (notebook),
- "page-added",
- G_CALLBACK (create_alternate_lang_plugin_panel), window);
+ "page-added",
+ G_CALLBACK (create_alternate_lang_plugin_panel), window);
tabs = gtr_window_get_all_tabs (window);
@@ -167,7 +164,7 @@ impl_activate (GtrPlugin * plugin, GtrWindow * window)
do
{
create_alternate_lang_plugin_panel (GTK_NOTEBOOK (notebook),
- tabs->data, 0, window);
+ tabs->data, 0, window);
}
while ((tabs = g_list_next (tabs)));
}
@@ -187,21 +184,21 @@ impl_deactivate (GtrPlugin * plugin, GtrWindow * window)
if (tabs != NULL)
{
do
- {
- alternatelang =
- g_object_get_data (G_OBJECT (tabs->data), TAB_DATA_KEY);
- gtr_tab_remove_widget_from_lateral_panel (GTR_TAB
- (tabs->data),
- alternatelang);
-
- g_object_set_data (G_OBJECT (tabs->data), WINDOW_DATA_KEY, NULL);
- }
+ {
+ alternatelang =
+ g_object_get_data (G_OBJECT (tabs->data), TAB_DATA_KEY);
+ gtr_tab_remove_widget_from_lateral_panel (GTR_TAB
+ (tabs->data),
+ alternatelang);
+
+ g_object_set_data (G_OBJECT (tabs->data), WINDOW_DATA_KEY, NULL);
+ }
while ((tabs = g_list_next (tabs)));
}
g_signal_handlers_disconnect_by_func (notebook,
- create_alternate_lang_plugin_panel,
- window);
+ create_alternate_lang_plugin_panel,
+ window);
/* Remove menuitem */
manager = gtr_window_get_ui_manager (window);
@@ -229,8 +226,7 @@ impl_update_ui (GtrPlugin * plugin, GtrWindow * window)
}
static void
-gtr_alternate_lang_plugin_class_init
- (GtrAlternateLangPluginClass * klass)
+ gtr_alternate_lang_plugin_class_init (GtrAlternateLangPluginClass * klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GtrPluginClass *plugin_class = GTR_PLUGIN_CLASS (klass);
diff --git a/plugins/alternate-language/gtr-alternate-language-plugin.h b/plugins/alternate-language/gtr-alternate-language-plugin.h
index 2fc8f49..6da6310 100644
--- a/plugins/alternate-language/gtr-alternate-language-plugin.h
+++ b/plugins/alternate-language/gtr-alternate-language-plugin.h
@@ -36,8 +36,7 @@ G_BEGIN_DECLS
#define GTR_IS_ALTERNATE_LANG_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_ALTERNATE_LANG_PLUGIN))
#define GTR_ALTERNATE_LANG_PLUGIN_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_ALTERNATE_LANG_PLUGIN_PLUGIN, GtrAlternateLangPluginClass))
/* Private structure type */
-typedef struct _GtrAlternateLangPluginPrivate
- GtrAlternateLangPluginPrivate;
+typedef struct _GtrAlternateLangPluginPrivate GtrAlternateLangPluginPrivate;
/*
* Main object structure
@@ -52,8 +51,7 @@ struct _GtrAlternateLangPlugin
/*
* Class definition
*/
-typedef struct _GtrAlternateLangPluginClass
- GtrAlternateLangPluginClass;
+typedef struct _GtrAlternateLangPluginClass GtrAlternateLangPluginClass;
struct _GtrAlternateLangPluginClass
{
diff --git a/plugins/charmap/gtr-charmap-panel.c b/plugins/charmap/gtr-charmap-panel.c
index 4c788ee..929cd58 100644
--- a/plugins/charmap/gtr-charmap-panel.c
+++ b/plugins/charmap/gtr-charmap-panel.c
@@ -47,12 +47,11 @@ struct _GtrCharmapPanelPrivate
#endif
};
-GTR_PLUGIN_DEFINE_TYPE (GtrCharmapPanel, gtr_charmap_panel,
- GTK_TYPE_VBOX)
+GTR_PLUGIN_DEFINE_TYPE (GtrCharmapPanel, gtr_charmap_panel, GTK_TYPE_VBOX)
#ifdef HAVE_GUCHARMAP_2
static void
on_chapter_view_selection_changed (GtkTreeSelection * selection,
- GtrCharmapPanel * panel)
+ GtrCharmapPanel * panel)
{
GtrCharmapPanelPrivate *priv = panel->priv;
GucharmapCodepointList *codepoint_list;
@@ -70,11 +69,11 @@ GTR_PLUGIN_DEFINE_TYPE (GtrCharmapPanel, gtr_charmap_panel,
#else
static void
on_chapter_changed (GucharmapChapters * chapters,
- GtrCharmapPanel * panel)
+ GtrCharmapPanel * panel)
{
gucharmap_table_set_codepoint_list (GUCHARMAP_TABLE (panel->priv->table),
- gucharmap_chapters_get_codepoint_list
- (chapters));
+ gucharmap_chapters_get_codepoint_list
+ (chapters));
}
#endif /* HAVE_GUCHARMAP_2 */
@@ -98,9 +97,9 @@ gtr_charmap_panel_init (GtrCharmapPanel * panel)
#ifdef HAVE_GUCHARMAP_2
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
- GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window),
- GTK_SHADOW_ETCHED_IN);
+ GTK_SHADOW_ETCHED_IN);
view = gucharmap_chapters_view_new ();
priv->chapters_view = GUCHARMAP_CHAPTERS_VIEW (view);
@@ -112,7 +111,7 @@ gtr_charmap_panel_init (GtrCharmapPanel * panel)
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
g_signal_connect (selection, "changed",
- G_CALLBACK (on_chapter_view_selection_changed), panel);
+ G_CALLBACK (on_chapter_view_selection_changed), panel);
gtk_container_add (GTK_CONTAINER (scrolled_window), view);
gtk_widget_show (view);
@@ -122,9 +121,9 @@ gtr_charmap_panel_init (GtrCharmapPanel * panel)
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
- GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window),
- GTK_SHADOW_ETCHED_IN);
+ GTK_SHADOW_ETCHED_IN);
chartable = gucharmap_chartable_new ();
priv->chartable = GUCHARMAP_CHARTABLE (chartable);
@@ -138,11 +137,11 @@ gtr_charmap_panel_init (GtrCharmapPanel * panel)
#else
priv->chapters = gucharmap_script_chapters_new ();
g_signal_connect (priv->chapters,
- "changed", G_CALLBACK (on_chapter_changed), panel);
+ "changed", G_CALLBACK (on_chapter_changed), panel);
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW
- (GUCHARMAP_CHAPTERS (priv->chapters)->
- tree_view), FALSE);
+ (GUCHARMAP_CHAPTERS
+ (priv->chapters)->tree_view), FALSE);
codepoint_list = gucharmap_chapters_get_codepoint_list
(GUCHARMAP_CHAPTERS (priv->chapters));
@@ -150,7 +149,7 @@ gtr_charmap_panel_init (GtrCharmapPanel * panel)
priv->table = gucharmap_table_new ();
gucharmap_table_set_codepoint_list (GUCHARMAP_TABLE (priv->table),
- codepoint_list);
+ codepoint_list);
gtk_paned_pack1 (paned, priv->chapters, FALSE, TRUE);
gtk_paned_pack2 (paned, priv->table, TRUE, TRUE);
diff --git a/plugins/charmap/gtr-charmap-panel.h b/plugins/charmap/gtr-charmap-panel.h
index e6f1a8d..5cb630c 100644
--- a/plugins/charmap/gtr-charmap-panel.h
+++ b/plugins/charmap/gtr-charmap-panel.h
@@ -79,12 +79,10 @@ gtr_charmap_panel_get_type (void)
GtkWidget *gtr_charmap_panel_new (void);
#ifdef HAVE_GUCHARMAP_2
- GucharmapChartable
- *gtr_charmap_panel_get_chartable (GtrCharmapPanel *
- panel);
+GucharmapChartable
+ * gtr_charmap_panel_get_chartable (GtrCharmapPanel * panel);
#else
- GucharmapTable
- *gtr_charmap_panel_get_table (GtrCharmapPanel * panel);
+GucharmapTable * gtr_charmap_panel_get_table (GtrCharmapPanel * panel);
#endif
G_END_DECLS
diff --git a/plugins/charmap/gtr-charmap-plugin.c b/plugins/charmap/gtr-charmap-plugin.c
index bc384b1..a227c2e 100644
--- a/plugins/charmap/gtr-charmap-plugin.c
+++ b/plugins/charmap/gtr-charmap-plugin.c
@@ -52,11 +52,10 @@ typedef struct
} WindowData;
GTR_PLUGIN_REGISTER_TYPE_WITH_CODE (GtrCharmapPlugin,
- gtr_charmap_plugin,
- gtr_charmap_panel_register_type
- (module);)
- static void gtr_charmap_plugin_init (GtrCharmapPlugin *
- plugin)
+ gtr_charmap_plugin,
+ gtr_charmap_panel_register_type (module);
+ )
+ static void gtr_charmap_plugin_init (GtrCharmapPlugin * plugin)
{
//gtr_debug_message (DEBUG_PLUGINS, "GtrCharmapPlugin initializing");
}
@@ -81,14 +80,14 @@ static void
#else
on_table_status_message (GucharmapTable * chartable,
#endif
- const gchar * message, GtrWindow * window)
+ const gchar * message, GtrWindow * window)
{
GtrStatusbar *statusbar;
WindowData *data;
statusbar = GTR_STATUSBAR (gtr_window_get_statusbar (window));
data = (WindowData *) g_object_get_data (G_OBJECT (window),
- WINDOW_DATA_KEY);
+ WINDOW_DATA_KEY);
g_return_if_fail (data != NULL);
gtr_statusbar_pop (statusbar, data->context_id);
@@ -100,10 +99,10 @@ on_table_status_message (GucharmapTable * chartable,
static void
#ifdef HAVE_GUCHARMAP_2
on_table_sync_active_char (GucharmapChartable * chartable,
- GParamSpec * psepc, GtrWindow * window)
+ GParamSpec * psepc, GtrWindow * window)
#else
on_table_set_active_char (GucharmapTable * chartable,
- gunichar wc, GtrWindow * window)
+ gunichar wc, GtrWindow * window)
#endif
{
GString *gs;
@@ -117,14 +116,14 @@ on_table_set_active_char (GucharmapTable * chartable,
gs = g_string_new (NULL);
g_string_append_printf (gs, "U+%4.4X %s", wc,
- gucharmap_get_unicode_name (wc));
+ gucharmap_get_unicode_name (wc));
temps = gucharmap_get_nameslist_equals (wc);
if (temps)
{
g_string_append_printf (gs, " = %s", temps[0]);
for (i = 1; temps[i]; i++)
- g_string_append_printf (gs, "; %s", temps[i]);
+ g_string_append_printf (gs, "; %s", temps[i]);
g_free (temps);
}
@@ -133,7 +132,7 @@ on_table_set_active_char (GucharmapTable * chartable,
{
g_string_append_printf (gs, " \342\200\242 %s", temps[0]);
for (i = 1; temps[i]; i++)
- g_string_append_printf (gs, "; %s", temps[i]);
+ g_string_append_printf (gs, "; %s", temps[i]);
g_free (temps);
}
@@ -143,7 +142,7 @@ on_table_set_active_char (GucharmapTable * chartable,
static gboolean
on_table_focus_out_event (GtkWidget * drawing_area,
- GdkEventFocus * event, GtrWindow * window)
+ GdkEventFocus * event, GtrWindow * window)
{
#ifdef HAVE_GUCHARMAP_2
GucharmapChartable *chartable;
@@ -153,15 +152,14 @@ on_table_focus_out_event (GtkWidget * drawing_area,
WindowData *data;
data = (WindowData *) g_object_get_data (G_OBJECT (window),
- WINDOW_DATA_KEY);
+ WINDOW_DATA_KEY);
g_return_val_if_fail (data != NULL, FALSE);
#ifdef HAVE_GUCHARMAP_2
chartable = gtr_charmap_panel_get_chartable
(GTR_CHARMAP_PANEL (data->panel));
#else
- chartable = gtr_charmap_panel_get_table
- (GTR_CHARMAP_PANEL (data->panel));
+ chartable = gtr_charmap_panel_get_table (GTR_CHARMAP_PANEL (data->panel));
#endif
on_table_status_message (chartable, NULL, window);
@@ -174,7 +172,7 @@ on_table_activate (GucharmapChartable * chartable, GtrWindow * window)
#else
static void
on_table_activate (GucharmapTable * chartable,
- gunichar wc, GtrWindow * window)
+ gunichar wc, GtrWindow * window)
#endif
{
GtkTextView *view;
@@ -225,38 +223,37 @@ create_charmap_panel (GtrWindow * window)
panel = gtr_charmap_panel_new ();
#ifdef HAVE_GUCHARMAP_2
- chartable =
- gtr_charmap_panel_get_chartable (GTR_CHARMAP_PANEL (panel));
+ chartable = gtr_charmap_panel_get_chartable (GTR_CHARMAP_PANEL (panel));
#else
table = gtr_charmap_panel_get_table (GTR_CHARMAP_PANEL (panel));
#endif
#ifdef HAVE_GUCHARMAP_2
g_signal_connect (chartable,
- "notify::active-character",
- G_CALLBACK (on_table_sync_active_char), window);
+ "notify::active-character",
+ G_CALLBACK (on_table_sync_active_char), window);
g_signal_connect (chartable,
- "focus-out-event",
- G_CALLBACK (on_table_focus_out_event), window);
+ "focus-out-event",
+ G_CALLBACK (on_table_focus_out_event), window);
g_signal_connect (chartable,
- "status-message",
- G_CALLBACK (on_table_status_message), window);
+ "status-message",
+ G_CALLBACK (on_table_status_message), window);
g_signal_connect (chartable,
- "activate", G_CALLBACK (on_table_activate), window);
+ "activate", G_CALLBACK (on_table_activate), window);
#else
g_signal_connect (table,
- "set-active-char",
- G_CALLBACK (on_table_set_active_char), window);
+ "set-active-char",
+ G_CALLBACK (on_table_set_active_char), window);
/* Note: GucharmapTable does not provide focus-out-event ... */
g_signal_connect (table->drawing_area,
- "focus-out-event",
- G_CALLBACK (on_table_focus_out_event), window);
+ "focus-out-event",
+ G_CALLBACK (on_table_focus_out_event), window);
g_signal_connect (table,
- "status-message",
- G_CALLBACK (on_table_status_message), window);
+ "status-message",
+ G_CALLBACK (on_table_status_message), window);
g_signal_connect (table,
- "activate", G_CALLBACK (on_table_activate), window);
+ "activate", G_CALLBACK (on_table_activate), window);
#endif /* HAVE_GUCHARMAP_2 */
gtk_widget_show_all (panel);
@@ -273,24 +270,23 @@ impl_activate (GtrPlugin * plugin, GtrWindow * window)
data = g_new (WindowData, 1);
gtr_application_register_icon (GTR_APP, "gucharmap.ico",
- "charmap-plugin-icon");
+ "charmap-plugin-icon");
data->panel = create_charmap_panel (window);
gtr_window_add_widget (window,
- data->panel,
- "GtrCharmapPlugin",
- _("Character Map"),
- "charmap-plugin-icon",
- GTR_WINDOW_PLACEMENT_LEFT);
+ data->panel,
+ "GtrCharmapPlugin",
+ _("Character Map"),
+ "charmap-plugin-icon", GTR_WINDOW_PLACEMENT_LEFT);
statusbar = GTR_STATUSBAR (gtr_window_get_statusbar (window));
data->context_id = gtr_statusbar_get_context_id (statusbar,
- "Character Description");
+ "Character Description");
g_object_set_data_full (G_OBJECT (window),
- WINDOW_DATA_KEY,
- data, (GDestroyNotify) free_window_data);
+ WINDOW_DATA_KEY,
+ data, (GDestroyNotify) free_window_data);
}
static void
@@ -304,15 +300,14 @@ impl_deactivate (GtrPlugin * plugin, GtrWindow * window)
#endif
data = (WindowData *) g_object_get_data (G_OBJECT (window),
- WINDOW_DATA_KEY);
+ WINDOW_DATA_KEY);
g_return_if_fail (data != NULL);
#ifdef HAVE_GUCHARMAP_2
chartable = gtr_charmap_panel_get_chartable
(GTR_CHARMAP_PANEL (data->panel));
#else
- chartable = gtr_charmap_panel_get_table
- (GTR_CHARMAP_PANEL (data->panel));
+ chartable = gtr_charmap_panel_get_table (GTR_CHARMAP_PANEL (data->panel));
#endif
on_table_status_message (chartable, NULL, window);
diff --git a/plugins/charmap/gtr-charmap-plugin.h b/plugins/charmap/gtr-charmap-plugin.h
index 4ab5c39..0fac4fa 100644
--- a/plugins/charmap/gtr-charmap-plugin.h
+++ b/plugins/charmap/gtr-charmap-plugin.h
@@ -38,8 +38,7 @@ G_BEGIN_DECLS
#define GTR_IS_CHARMAP_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_CHARMAP_PLUGIN))
#define GTR_CHARMAP_PLUGIN_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_CHARMAP_PLUGIN, GtrCharmapPluginClass))
/* Private structure type */
-typedef struct _GtrCharmapPluginPrivate
- GtrCharmapPluginPrivate;
+typedef struct _GtrCharmapPluginPrivate GtrCharmapPluginPrivate;
/*
* Main object structure
diff --git a/plugins/dictionary/gtr-dict-panel.c b/plugins/dictionary/gtr-dict-panel.c
index 36d7662..d887623 100644
--- a/plugins/dictionary/gtr-dict-panel.c
+++ b/plugins/dictionary/gtr-dict-panel.c
@@ -52,8 +52,7 @@
#define GDICT_SIDEBAR_STRATEGIES_PAGE "strat-chooser"
#define GDICT_SIDEBAR_SOURCES_PAGE "source-chooser"
-GTR_PLUGIN_DEFINE_TYPE (GtrDictPanel, gtr_dict_panel,
- GTK_TYPE_VBOX)
+GTR_PLUGIN_DEFINE_TYPE (GtrDictPanel, gtr_dict_panel, GTK_TYPE_VBOX)
struct _GtrDictPanelPrivate
{
GtkPaned *paned;
@@ -83,7 +82,7 @@ GTR_PLUGIN_DEFINE_TYPE (GtrDictPanel, gtr_dict_panel,
static void
gtr_dict_panel_create_warning_dialog (const gchar * primary,
- const gchar * secondary)
+ const gchar * secondary)
{
GtkWidget *dialog;
@@ -91,20 +90,20 @@ GTR_PLUGIN_DEFINE_TYPE (GtrDictPanel, gtr_dict_panel,
return;
dialog = gtk_message_dialog_new (NULL,
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_WARNING,
- GTK_BUTTONS_CLOSE, "%s", primary);
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE, "%s", primary);
if (secondary)
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
- "%s", secondary);
+ "%s", secondary);
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
}
static gchar *
gdict_gconf_get_string_with_default (GConfClient * client,
- const gchar * key, const gchar * def)
+ const gchar * key, const gchar * def)
{
gchar *val;
@@ -113,8 +112,7 @@ gdict_gconf_get_string_with_default (GConfClient * client,
}
static void
-gtr_dict_panel_entry_activate_cb (GtkWidget * widget,
- GtrDictPanel * panel)
+gtr_dict_panel_entry_activate_cb (GtkWidget * widget, GtrDictPanel * panel)
{
GtrDictPanelPrivate *priv = panel->priv;
const gchar *text;
@@ -131,8 +129,7 @@ gtr_dict_panel_entry_activate_cb (GtkWidget * widget,
}
static void
-gtr_dict_panel_set_database (GtrDictPanel * panel,
- const gchar * database)
+gtr_dict_panel_set_database (GtrDictPanel * panel, const gchar * database)
{
GtrDictPanelPrivate *priv = panel->priv;
@@ -142,15 +139,14 @@ gtr_dict_panel_set_database (GtrDictPanel * panel,
priv->database = g_strdup (database);
else
priv->database = gdict_gconf_get_string_with_default (priv->gconf_client,
- DICTIONARY_GCONF_DATABASE_KEY,
- GDICT_DEFAULT_DATABASE);
+ DICTIONARY_GCONF_DATABASE_KEY,
+ GDICT_DEFAULT_DATABASE);
if (priv->defbox)
gdict_defbox_set_database (GDICT_DEFBOX (priv->defbox), priv->database);
}
static void
-gtr_dict_panel_set_strategy (GtrDictPanel * panel,
- const gchar * strategy)
+gtr_dict_panel_set_strategy (GtrDictPanel * panel, const gchar * strategy)
{
GtrDictPanelPrivate *priv = panel->priv;
@@ -160,8 +156,8 @@ gtr_dict_panel_set_strategy (GtrDictPanel * panel,
priv->strategy = g_strdup (strategy);
else
priv->strategy = gdict_gconf_get_string_with_default (priv->gconf_client,
- DICTIONARY_GCONF_STRATEGY_KEY,
- GDICT_DEFAULT_STRATEGY);
+ DICTIONARY_GCONF_STRATEGY_KEY,
+ GDICT_DEFAULT_STRATEGY);
}
static GdictContext *
@@ -180,21 +176,19 @@ get_context_from_loader (GtrDictPanel * panel)
gchar *detail;
detail =
- g_strdup_printf (_("No dictionary source available with name '%s'"),
- priv->source_name);
+ g_strdup_printf (_("No dictionary source available with name '%s'"),
+ priv->source_name);
gtr_dict_panel_create_warning_dialog (_
- ("Unable to find dictionary source"),
- detail);
+ ("Unable to find dictionary source"),
+ detail);
g_free (detail);
return NULL;
}
- gtr_dict_panel_set_database (panel,
- gdict_source_get_database (source));
- gtr_dict_panel_set_strategy (panel,
- gdict_source_get_strategy (source));
+ gtr_dict_panel_set_database (panel, gdict_source_get_database (source));
+ gtr_dict_panel_set_strategy (panel, gdict_source_get_strategy (source));
retval = gdict_source_get_context (source);
if (!retval)
@@ -202,11 +196,11 @@ get_context_from_loader (GtrDictPanel * panel)
gchar *detail;
detail = g_strdup_printf (_("No context available for source '%s'"),
- gdict_source_get_description (source));
+ gdict_source_get_description (source));
gtr_dict_panel_create_warning_dialog (_
- ("Unable to create a context"),
- detail);
+ ("Unable to create a context"),
+ detail);
g_free (detail);
g_object_unref (source);
@@ -220,8 +214,7 @@ get_context_from_loader (GtrDictPanel * panel)
}
static void
-gtr_dict_panel_set_context (GtrDictPanel * panel,
- GdictContext * context)
+gtr_dict_panel_set_context (GtrDictPanel * panel, GdictContext * context)
{
GtrDictPanelPrivate *priv = panel->priv;
@@ -236,11 +229,11 @@ gtr_dict_panel_set_context (GtrDictPanel * panel,
if (priv->db_chooser)
gdict_database_chooser_set_context (GDICT_DATABASE_CHOOSER
- (priv->db_chooser), context);
+ (priv->db_chooser), context);
if (priv->strat_chooser)
gdict_strategy_chooser_set_context (GDICT_STRATEGY_CHOOSER
- (priv->strat_chooser), context);
+ (priv->strat_chooser), context);
if (!context)
return;
@@ -250,7 +243,7 @@ gtr_dict_panel_set_context (GtrDictPanel * panel,
static void
gtr_dict_panel_set_source_name (GtrDictPanel * panel,
- const gchar * source_name)
+ const gchar * source_name)
{
GtrDictPanelPrivate *priv = panel->priv;
GdictContext *context;
@@ -266,22 +259,22 @@ gtr_dict_panel_set_source_name (GtrDictPanel * panel,
else
priv->source_name =
gdict_gconf_get_string_with_default (priv->gconf_client,
- DICTIONARY_GCONF_SOURCE_KEY,
- DICTIONARY_DEFAULT_SOURCE_NAME);
+ DICTIONARY_GCONF_SOURCE_KEY,
+ DICTIONARY_DEFAULT_SOURCE_NAME);
context = get_context_from_loader (panel);
gtr_dict_panel_set_context (panel, context);
if (priv->source_chooser)
gdict_source_chooser_set_current_source (GDICT_SOURCE_CHOOSER
- (priv->source_chooser),
- priv->source_name);
+ (priv->source_chooser),
+ priv->source_name);
}
static void
source_activated_cb (GdictSourceChooser * chooser,
- const gchar * source_name,
- GdictSource * source, GtrDictPanel * panel)
+ const gchar * source_name,
+ GdictSource * source, GtrDictPanel * panel)
{
g_signal_handlers_block_by_func (chooser, source_activated_cb, panel);
gtr_dict_panel_set_source_name (panel, source_name);
@@ -292,17 +285,16 @@ source_activated_cb (GdictSourceChooser * chooser,
gchar *message;
message = g_strdup_printf (_("Dictionary source '%s' selected"),
- gdict_source_get_description (source));
- gtr_statusbar_flash_message (panel->priv->status, 0, "%s",
- message);
+ gdict_source_get_description (source));
+ gtr_statusbar_flash_message (panel->priv->status, 0, "%s", message);
g_free (message);
}
}
static void
strategy_activated_cb (GdictStrategyChooser * chooser,
- const gchar * strat_name,
- const gchar * strat_desc, GtrDictPanel * panel)
+ const gchar * strat_name,
+ const gchar * strat_desc, GtrDictPanel * panel)
{
GtrDictPanelPrivate *priv = panel->priv;
gtr_dict_panel_set_strategy (panel, strat_name);
@@ -312,16 +304,15 @@ strategy_activated_cb (GdictStrategyChooser * chooser,
gchar *message;
message = g_strdup_printf (_("Strategy '%s' selected"), strat_desc);
- gtr_statusbar_flash_message (panel->priv->status, 0, "%s",
- message);
+ gtr_statusbar_flash_message (panel->priv->status, 0, "%s", message);
g_free (message);
}
}
static void
database_activated_cb (GdictDatabaseChooser * chooser,
- const gchar * db_name,
- const gchar * db_desc, GtrDictPanel * panel)
+ const gchar * db_name,
+ const gchar * db_desc, GtrDictPanel * panel)
{
GtrDictPanelPrivate *priv = panel->priv;
gtr_dict_panel_set_database (panel, db_name);
@@ -331,15 +322,14 @@ database_activated_cb (GdictDatabaseChooser * chooser,
gchar *message;
message = g_strdup_printf (_("Database '%s' selected"), db_desc);
- gtr_statusbar_flash_message (panel->priv->status, 0, "%s",
- message);
+ gtr_statusbar_flash_message (panel->priv->status, 0, "%s", message);
g_free (message);
}
}
static void
gtr_dict_panel_set_word (GtrDictPanel * panel,
- const gchar * word, const gchar * database)
+ const gchar * word, const gchar * database)
{
GtrDictPanelPrivate *priv = panel->priv;
@@ -363,9 +353,8 @@ gtr_dict_panel_set_word (GtrDictPanel * panel,
static void
speller_word_activated_cb (GdictSpeller * speller,
- const gchar * word,
- const gchar * db_name,
- GtrDictPanel * panel)
+ const gchar * word,
+ const gchar * db_name, GtrDictPanel * panel)
{
GtrDictPanelPrivate *priv = panel->priv;
gtk_entry_set_text (GTK_ENTRY (priv->entry), word);
@@ -377,8 +366,7 @@ speller_word_activated_cb (GdictSpeller * speller,
gchar *message;
message = g_strdup_printf (_("Word '%s' selected"), word);
- gtr_statusbar_flash_message (panel->priv->status, 0, "%s",
- message);
+ gtr_statusbar_flash_message (panel->priv->status, 0, "%s", message);
g_free (message);
}
}
@@ -396,34 +384,34 @@ sidebar_page_changed_cb (GdictSidebar * sidebar, GtrDictPanel * panel)
{
case 's':
{
- switch (page_id[1])
- {
- case 'p': /* speller */
- message = _("Double-click on the word to look up");
- if (priv->word)
- gdict_speller_match (GDICT_SPELLER (priv->speller), priv->word);
- break;
- case 't': /* strat-chooser */
- message = _("Double-click on the matching strategy to use");
-
- gdict_strategy_chooser_refresh (GDICT_STRATEGY_CHOOSER
- (priv->strat_chooser));
- break;
- case 'o': /* source-chooser */
- message = _("Double-click on the source to use");
- gdict_source_chooser_refresh (GDICT_SOURCE_CHOOSER
- (priv->source_chooser));
- break;
- default:
- message = NULL;
- }
+ switch (page_id[1])
+ {
+ case 'p': /* speller */
+ message = _("Double-click on the word to look up");
+ if (priv->word)
+ gdict_speller_match (GDICT_SPELLER (priv->speller), priv->word);
+ break;
+ case 't': /* strat-chooser */
+ message = _("Double-click on the matching strategy to use");
+
+ gdict_strategy_chooser_refresh (GDICT_STRATEGY_CHOOSER
+ (priv->strat_chooser));
+ break;
+ case 'o': /* source-chooser */
+ message = _("Double-click on the source to use");
+ gdict_source_chooser_refresh (GDICT_SOURCE_CHOOSER
+ (priv->source_chooser));
+ break;
+ default:
+ message = NULL;
+ }
}
break;
- case 'd': /* db-chooser */
+ case 'd': /* db-chooser */
message = _("Double-click on the database to use");
gdict_database_chooser_refresh (GDICT_DATABASE_CHOOSER
- (priv->db_chooser));
+ (priv->db_chooser));
break;
default:
message = NULL;
@@ -431,8 +419,7 @@ sidebar_page_changed_cb (GdictSidebar * sidebar, GtrDictPanel * panel)
}
if (message && priv->status)
- gtr_statusbar_flash_message (panel->priv->status, 0, "%s",
- message);
+ gtr_statusbar_flash_message (panel->priv->status, 0, "%s", message);
}
static void
@@ -445,15 +432,14 @@ store_position (GObject * gobject, GParamSpec * arg1, gpointer user_data)
client = gconf_client_get_default ();
position = gtk_paned_get_position (paned);
gconf_client_set_int (client, DICTIONARY_GCONF_POSITION_KEY, position,
- NULL);
+ NULL);
g_object_unref (client);
}
static void
gtr_dict_panel_link_clicked (GtkWidget * defbox,
- const gchar * link_text,
- GtrDictPanel * panel)
+ const gchar * link_text, GtrDictPanel * panel)
{
if (!link_text)
return;
@@ -486,8 +472,7 @@ gtr_dict_panel_draw (GtrDictPanel * panel)
*/
panel->priv->button = gtk_button_new_with_mnemonic (_("Look _up:"));
g_signal_connect (panel->priv->button, "clicked",
- G_CALLBACK (gtr_dict_panel_entry_activate_cb),
- panel);
+ G_CALLBACK (gtr_dict_panel_entry_activate_cb), panel);
gtk_button_set_relief (GTK_BUTTON (panel->priv->button), GTK_RELIEF_NONE);
gtk_box_pack_start (GTK_BOX (hbox), panel->priv->button, FALSE, FALSE, 0);
gtk_widget_show (panel->priv->button);
@@ -500,8 +485,7 @@ gtr_dict_panel_draw (GtrDictPanel * panel)
gtk_entry_set_text (GTK_ENTRY (panel->priv->entry), panel->priv->word);
g_signal_connect (panel->priv->entry, "activate",
- G_CALLBACK (gtr_dict_panel_entry_activate_cb),
- panel);
+ G_CALLBACK (gtr_dict_panel_entry_activate_cb), panel);
gtk_box_pack_start (GTK_BOX (hbox), panel->priv->entry, TRUE, TRUE, 0);
gtk_widget_show (panel->priv->entry);
@@ -512,9 +496,9 @@ gtr_dict_panel_draw (GtrDictPanel * panel)
panel->priv->defbox = gdict_defbox_new ();
if (panel->priv->context)
gdict_defbox_set_context (GDICT_DEFBOX (panel->priv->defbox),
- panel->priv->context);
+ panel->priv->context);
g_signal_connect (panel->priv->defbox, "link-clicked",
- G_CALLBACK (gtr_dict_panel_link_clicked), panel);
+ G_CALLBACK (gtr_dict_panel_link_clicked), panel);
gtk_container_add (GTK_CONTAINER (vbox), panel->priv->defbox);
gtk_widget_show (panel->priv->defbox);
@@ -524,24 +508,24 @@ gtr_dict_panel_draw (GtrDictPanel * panel)
*/
panel->priv->sidebar = gdict_sidebar_new ();
g_signal_connect (panel->priv->sidebar, "page-changed",
- G_CALLBACK (sidebar_page_changed_cb), panel);
+ G_CALLBACK (sidebar_page_changed_cb), panel);
/*
* Paned
*/
panel->priv->paned = GTK_PANED (gtk_vpaned_new ());
gtk_box_pack_start (GTK_BOX (panel), GTK_WIDGET (panel->priv->paned), TRUE,
- TRUE, 0);
+ TRUE, 0);
gtk_paned_pack1 (panel->priv->paned, vbox, FALSE, TRUE);
gtk_paned_pack2 (panel->priv->paned, panel->priv->sidebar, TRUE, TRUE);
gtk_widget_show (GTK_WIDGET (panel->priv->paned));
position = gconf_client_get_int (panel->priv->gconf_client,
- DICTIONARY_GCONF_POSITION_KEY, NULL);
+ DICTIONARY_GCONF_POSITION_KEY, NULL);
gtk_paned_set_position (GTK_PANED (panel->priv->paned), position);
g_signal_connect (panel->priv->paned, "notify::position",
- G_CALLBACK (store_position), NULL);
+ G_CALLBACK (store_position), NULL);
/*
@@ -550,13 +534,13 @@ gtr_dict_panel_draw (GtrDictPanel * panel)
panel->priv->speller = gdict_speller_new ();
if (panel->priv->context)
gdict_speller_set_context (GDICT_SPELLER (panel->priv->speller),
- panel->priv->context);
+ panel->priv->context);
g_signal_connect (panel->priv->speller, "word-activated",
- G_CALLBACK (speller_word_activated_cb), panel);
+ G_CALLBACK (speller_word_activated_cb), panel);
gdict_sidebar_add_page (GDICT_SIDEBAR (panel->priv->sidebar),
- GDICT_SIDEBAR_SPELLER_PAGE,
- _("Similar words"), panel->priv->speller);
+ GDICT_SIDEBAR_SPELLER_PAGE,
+ _("Similar words"), panel->priv->speller);
gtk_widget_show (panel->priv->speller);
/*
@@ -565,14 +549,14 @@ gtr_dict_panel_draw (GtrDictPanel * panel)
panel->priv->db_chooser = gdict_database_chooser_new ();
if (panel->priv->context)
gdict_database_chooser_set_context (GDICT_DATABASE_CHOOSER
- (panel->priv->db_chooser),
- panel->priv->context);
+ (panel->priv->db_chooser),
+ panel->priv->context);
g_signal_connect (panel->priv->db_chooser, "database-activated",
- G_CALLBACK (database_activated_cb), panel);
+ G_CALLBACK (database_activated_cb), panel);
gdict_sidebar_add_page (GDICT_SIDEBAR (panel->priv->sidebar),
- GDICT_SIDEBAR_DATABASES_PAGE,
- _("Available dictionaries"),
- panel->priv->db_chooser);
+ GDICT_SIDEBAR_DATABASES_PAGE,
+ _("Available dictionaries"),
+ panel->priv->db_chooser);
gtk_widget_show (panel->priv->db_chooser);
/*
@@ -581,24 +565,24 @@ gtr_dict_panel_draw (GtrDictPanel * panel)
panel->priv->strat_chooser = gdict_strategy_chooser_new ();
if (panel->priv->context)
gdict_strategy_chooser_set_context (GDICT_STRATEGY_CHOOSER
- (panel->priv->strat_chooser),
- panel->priv->context);
+ (panel->priv->strat_chooser),
+ panel->priv->context);
g_signal_connect (panel->priv->strat_chooser, "strategy-activated",
- G_CALLBACK (strategy_activated_cb), panel);
+ G_CALLBACK (strategy_activated_cb), panel);
gdict_sidebar_add_page (GDICT_SIDEBAR (panel->priv->sidebar),
- GDICT_SIDEBAR_STRATEGIES_PAGE,
- _("Available strategies"),
- panel->priv->strat_chooser);
+ GDICT_SIDEBAR_STRATEGIES_PAGE,
+ _("Available strategies"),
+ panel->priv->strat_chooser);
gtk_widget_show (panel->priv->strat_chooser);
/* Source chooser */
panel->priv->source_chooser =
gdict_source_chooser_new_with_loader (panel->priv->loader);
g_signal_connect (panel->priv->source_chooser, "source-activated",
- G_CALLBACK (source_activated_cb), panel);
+ G_CALLBACK (source_activated_cb), panel);
gdict_sidebar_add_page (GDICT_SIDEBAR (panel->priv->sidebar),
- GDICT_SIDEBAR_SOURCES_PAGE, _("Dictionary sources"),
- panel->priv->source_chooser);
+ GDICT_SIDEBAR_SOURCES_PAGE, _("Dictionary sources"),
+ panel->priv->source_chooser);
gtk_widget_show (panel->priv->source_chooser);
gtk_widget_show (panel->priv->sidebar);
@@ -606,39 +590,36 @@ gtr_dict_panel_draw (GtrDictPanel * panel)
static void
gtr_dict_panel_gconf_notify_cb (GConfClient * client,
- guint cnxn_id,
- GConfEntry * entry,
- gpointer user_data)
+ guint cnxn_id,
+ GConfEntry * entry, gpointer user_data)
{
GtrDictPanel *panel = GTR_DICT_PANEL (user_data);
if (strcmp (entry->key, DICTIONARY_GCONF_SOURCE_KEY) == 0)
{
if (entry->value && (entry->value->type == GCONF_VALUE_STRING))
- gtr_dict_panel_set_source_name (panel,
- gconf_value_get_string
- (entry->value));
+ gtr_dict_panel_set_source_name (panel,
+ gconf_value_get_string
+ (entry->value));
else
- gtr_dict_panel_set_source_name (panel,
- DICTIONARY_DEFAULT_SOURCE_NAME);
+ gtr_dict_panel_set_source_name (panel,
+ DICTIONARY_DEFAULT_SOURCE_NAME);
}
else if (strcmp (entry->key, DICTIONARY_GCONF_DATABASE_KEY) == 0)
{
if (entry->value && (entry->value->type == GCONF_VALUE_STRING))
- gtr_dict_panel_set_database (panel,
- gconf_value_get_string (entry->
- value));
+ gtr_dict_panel_set_database (panel,
+ gconf_value_get_string (entry->value));
else
- gtr_dict_panel_set_database (panel, GDICT_DEFAULT_DATABASE);
+ gtr_dict_panel_set_database (panel, GDICT_DEFAULT_DATABASE);
}
else if (strcmp (entry->key, DICTIONARY_GCONF_STRATEGY_KEY) == 0)
{
if (entry->value && (entry->value->type == GCONF_VALUE_STRING))
- gtr_dict_panel_set_strategy (panel,
- gconf_value_get_string (entry->
- value));
+ gtr_dict_panel_set_strategy (panel,
+ gconf_value_get_string (entry->value));
else
- gtr_dict_panel_set_strategy (panel, GDICT_DEFAULT_STRATEGY);
+ gtr_dict_panel_set_strategy (panel, GDICT_DEFAULT_STRATEGY);
}
}
@@ -668,8 +649,8 @@ gtr_dict_panel_init (GtrDictPanel * panel)
gconf_error = NULL;
gconf_client_add_dir (priv->gconf_client,
- DICTIONARY_GCONF_DIR,
- GCONF_CLIENT_PRELOAD_ONELEVEL, &gconf_error);
+ DICTIONARY_GCONF_DIR,
+ GCONF_CLIENT_PRELOAD_ONELEVEL, &gconf_error);
if (gconf_error)
{
/*gdict_show_gerror_dialog (NULL,
@@ -679,9 +660,9 @@ gtr_dict_panel_init (GtrDictPanel * panel)
}
priv->notify_id = gconf_client_notify_add (priv->gconf_client,
- DICTIONARY_GCONF_DIR,
- gtr_dict_panel_gconf_notify_cb,
- panel, NULL, &gconf_error);
+ DICTIONARY_GCONF_DIR,
+ gtr_dict_panel_gconf_notify_cb,
+ panel, NULL, &gconf_error);
if (gconf_error)
{
/*gdict_show_gerror_dialog (NULL,
@@ -728,8 +709,7 @@ gtr_dict_panel_new (GtrWindow * window)
GtrDictPanel *panel;
panel = g_object_new (GTR_TYPE_DICT_PANEL, NULL);
- panel->priv->status =
- GTR_STATUSBAR (gtr_window_get_statusbar (window));
+ panel->priv->status = GTR_STATUSBAR (gtr_window_get_statusbar (window));
return GTK_WIDGET (panel);
}
diff --git a/plugins/dictionary/gtr-dict-panel.h b/plugins/dictionary/gtr-dict-panel.h
index b756616..63c2c73 100644
--- a/plugins/dictionary/gtr-dict-panel.h
+++ b/plugins/dictionary/gtr-dict-panel.h
@@ -71,8 +71,7 @@ gtr_dict_panel_get_type (void)
GtkWidget *gtr_dict_panel_new (GtrWindow * window);
- void gtr_dict_panel_set_position (GtrDictPanel * panel,
- gint pos);
+ void gtr_dict_panel_set_position (GtrDictPanel * panel, gint pos);
G_END_DECLS
#endif /* __DICT_PANEL_H__ */
diff --git a/plugins/dictionary/gtr-dictionary-plugin.c b/plugins/dictionary/gtr-dictionary-plugin.c
index 91bd18b..0dfafaa 100644
--- a/plugins/dictionary/gtr-dictionary-plugin.c
+++ b/plugins/dictionary/gtr-dictionary-plugin.c
@@ -40,9 +40,9 @@ typedef struct
} WindowData;
GTR_PLUGIN_REGISTER_TYPE_WITH_CODE (GtrDictPlugin,
- gtr_dict_plugin,
- gtr_dict_panel_register_type
- (module);)
+ gtr_dict_plugin,
+ gtr_dict_panel_register_type (module);
+ )
static void gtr_dict_plugin_init (GtrDictPlugin * plugin)
{
}
@@ -84,18 +84,17 @@ impl_activate (GtrPlugin * plugin, GtrWindow * window)
data->panel = create_dict_panel (window);
gtr_application_register_icon (GTR_APP, "gnome-dictionary.png",
- "dictionary-icon");
+ "dictionary-icon");
gtr_window_add_widget (window,
- data->panel,
- "GtrDictionaryPlugin",
- _("Dictionary"),
- "dictionary-icon",
- GTR_WINDOW_PLACEMENT_LEFT);
+ data->panel,
+ "GtrDictionaryPlugin",
+ _("Dictionary"),
+ "dictionary-icon", GTR_WINDOW_PLACEMENT_LEFT);
g_object_set_data_full (G_OBJECT (window),
- WINDOW_DATA_KEY,
- data, (GDestroyNotify) free_window_data);
+ WINDOW_DATA_KEY,
+ data, (GDestroyNotify) free_window_data);
}
static void
@@ -104,7 +103,7 @@ impl_deactivate (GtrPlugin * plugin, GtrWindow * window)
WindowData *data;
data = (WindowData *) g_object_get_data (G_OBJECT (window),
- WINDOW_DATA_KEY);
+ WINDOW_DATA_KEY);
g_return_if_fail (data != NULL);
gtr_window_remove_widget (window, data->panel);
diff --git a/plugins/dictionary/gtr-gdict-sidebar.c b/plugins/dictionary/gtr-gdict-sidebar.c
index 48e169a..bfe7a40 100644
--- a/plugins/dictionary/gtr-gdict-sidebar.c
+++ b/plugins/dictionary/gtr-gdict-sidebar.c
@@ -138,9 +138,9 @@ gdict_sidebar_dispose (GObject * object)
static void
gdict_sidebar_menu_position_function (GtkMenu * menu,
- gint * x,
- gint * y,
- gboolean * push_in, gpointer user_data)
+ gint * x,
+ gint * y,
+ gboolean * push_in, gpointer user_data)
{
GtkWidget *widget;
@@ -158,8 +158,8 @@ gdict_sidebar_menu_position_function (GtkMenu * menu,
static gboolean
gdict_sidebar_select_button_press_cb (GtkWidget * widget,
- GdkEventButton * event,
- gpointer user_data)
+ GdkEventButton * event,
+ gpointer user_data)
{
GdictSidebar *sidebar = GDICT_SIDEBAR (user_data);
@@ -172,14 +172,14 @@ gdict_sidebar_select_button_press_cb (GtkWidget * widget,
gtk_widget_set_size_request (sidebar->priv->menu, -1, -1);
gtk_widget_size_request (sidebar->priv->menu, &req);
gtk_widget_set_size_request (sidebar->priv->menu,
- MAX (width, req.width), -1);
+ MAX (width, req.width), -1);
gtk_widget_grab_focus (widget);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
gtk_menu_popup (GTK_MENU (sidebar->priv->menu),
- NULL, NULL,
- gdict_sidebar_menu_position_function, widget,
- event->button, event->time);
+ NULL, NULL,
+ gdict_sidebar_menu_position_function, widget,
+ event->button, event->time);
return TRUE;
}
@@ -189,7 +189,7 @@ gdict_sidebar_select_button_press_cb (GtkWidget * widget,
static gboolean
gdict_sidebar_select_key_press_cb (GtkWidget * widget,
- GdkEventKey * event, gpointer user_data)
+ GdkEventKey * event, gpointer user_data)
{
GdictSidebar *sidebar = GDICT_SIDEBAR (user_data);
@@ -199,9 +199,9 @@ gdict_sidebar_select_key_press_cb (GtkWidget * widget,
{
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
gtk_menu_popup (GTK_MENU (sidebar->priv->menu),
- NULL, NULL,
- gdict_sidebar_menu_position_function, widget,
- 1, event->time);
+ NULL, NULL,
+ gdict_sidebar_menu_position_function, widget,
+ 1, event->time);
return TRUE;
}
@@ -270,16 +270,16 @@ gdict_sidebar_class_init (GdictSidebarClass * klass)
sidebar_signals[PAGE_CHANGED] =
g_signal_new ("page-changed",
- G_TYPE_FROM_CLASS (gobject_class),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GdictSidebarClass, page_changed),
- NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+ G_TYPE_FROM_CLASS (gobject_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GdictSidebarClass, page_changed),
+ NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
sidebar_signals[CLOSED] =
g_signal_new ("closed",
- G_TYPE_FROM_CLASS (gobject_class),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GdictSidebarClass, closed),
- NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+ G_TYPE_FROM_CLASS (gobject_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GdictSidebarClass, closed),
+ NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
}
static void
@@ -311,10 +311,10 @@ gdict_sidebar_init (GdictSidebar * sidebar)
select_button = gtk_toggle_button_new ();
gtk_button_set_relief (GTK_BUTTON (select_button), GTK_RELIEF_NONE);
g_signal_connect (select_button, "button-press-event",
- G_CALLBACK (gdict_sidebar_select_button_press_cb),
- sidebar);
+ G_CALLBACK (gdict_sidebar_select_button_press_cb),
+ sidebar);
g_signal_connect (select_button, "key-press-event",
- G_CALLBACK (gdict_sidebar_select_key_press_cb), sidebar);
+ G_CALLBACK (gdict_sidebar_select_key_press_cb), sidebar);
priv->select_button = select_button;
select_hbox = gtk_hbox_new (FALSE, 0);
@@ -336,18 +336,18 @@ gdict_sidebar_init (GdictSidebar * sidebar)
sidebar->priv->menu = gtk_menu_new ();
g_signal_connect (sidebar->priv->menu, "deactivate",
- G_CALLBACK (gdict_sidebar_menu_deactivate_cb), sidebar);
+ G_CALLBACK (gdict_sidebar_menu_deactivate_cb), sidebar);
gtk_menu_attach_to_widget (GTK_MENU (sidebar->priv->menu),
- GTK_WIDGET (sidebar),
- gdict_sidebar_menu_detach_cb);
+ GTK_WIDGET (sidebar),
+ gdict_sidebar_menu_detach_cb);
gtk_widget_show (sidebar->priv->menu);
sidebar->priv->notebook = gtk_notebook_new ();
gtk_notebook_set_show_border (GTK_NOTEBOOK (sidebar->priv->notebook),
- FALSE);
+ FALSE);
gtk_notebook_set_show_tabs (GTK_NOTEBOOK (sidebar->priv->notebook), FALSE);
gtk_box_pack_start (GTK_BOX (sidebar), sidebar->priv->notebook, TRUE, TRUE,
- 6);
+ 6);
gtk_widget_show (sidebar->priv->notebook);
}
@@ -363,8 +363,8 @@ gdict_sidebar_new (void)
void
gdict_sidebar_add_page (GdictSidebar * sidebar,
- const gchar * page_id,
- const gchar * page_name, GtkWidget * page_widget)
+ const gchar * page_id,
+ const gchar * page_name, GtkWidget * page_widget)
{
GdictSidebarPrivate *priv;
SidebarPage *page;
@@ -380,8 +380,8 @@ gdict_sidebar_add_page (GdictSidebar * sidebar,
if (g_hash_table_lookup (priv->pages_by_id, page_id))
{
g_warning ("Attempting to add a page to the sidebar with "
- "id `%s', but there already is a page with the "
- "same id. Aborting...", page_id);
+ "id `%s', but there already is a page with the "
+ "same id. Aborting...", page_id);
return;
}
@@ -392,15 +392,15 @@ gdict_sidebar_add_page (GdictSidebar * sidebar,
g_hash_table_insert (priv->pages_by_id, page->id, page);
page->index = gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook),
- page_widget, NULL);
+ page_widget, NULL);
/* add the menu item for the page */
menu_item = gtk_image_menu_item_new_with_label (page_name);
g_object_set_qdata_full (G_OBJECT (menu_item),
- sidebar_page_id_quark,
- g_strdup (page_id), (GDestroyNotify) g_free);
+ sidebar_page_id_quark,
+ g_strdup (page_id), (GDestroyNotify) g_free);
g_signal_connect (menu_item, "activate",
- G_CALLBACK (gdict_sidebar_menu_item_activate), sidebar);
+ G_CALLBACK (gdict_sidebar_menu_item_activate), sidebar);
gtk_menu_shell_append (GTK_MENU_SHELL (priv->menu), menu_item);
gtk_widget_show (menu_item);
page->menu_item = menu_item;
@@ -425,8 +425,8 @@ gdict_sidebar_remove_page (GdictSidebar * sidebar, const gchar * page_id)
if ((page = g_hash_table_lookup (priv->pages_by_id, page_id)) == NULL)
{
g_warning ("Attempting to remove a page from the sidebar with "
- "id `%s', but there is no page with this id. Aborting...",
- page_id);
+ "id `%s', but there is no page with this id. Aborting...",
+ page_id);
return;
}
@@ -436,10 +436,10 @@ gdict_sidebar_remove_page (GdictSidebar * sidebar, const gchar * page_id)
GtkWidget *menu_item = l->data;
if (menu_item == page->menu_item)
- {
- gtk_container_remove (GTK_CONTAINER (priv->menu), menu_item);
- break;
- }
+ {
+ gtk_container_remove (GTK_CONTAINER (priv->menu), menu_item);
+ break;
+ }
}
g_list_free (children);
@@ -455,10 +455,10 @@ gdict_sidebar_remove_page (GdictSidebar * sidebar, const gchar * page_id)
if (page)
{
gtk_menu_shell_select_item (GTK_MENU_SHELL (priv->menu),
- page->menu_item);
+ page->menu_item);
gtk_label_set_text (GTK_LABEL (priv->label), page->name);
gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook),
- page->index);
+ page->index);
}
else
gtk_widget_hide (GTK_WIDGET (sidebar));
diff --git a/plugins/dictionary/gtr-gdict-sidebar.h b/plugins/dictionary/gtr-gdict-sidebar.h
index 8433a29..c75877c 100644
--- a/plugins/dictionary/gtr-gdict-sidebar.h
+++ b/plugins/dictionary/gtr-gdict-sidebar.h
@@ -63,16 +63,16 @@ gdict_sidebar_get_type (void)
GtkWidget *gdict_sidebar_new (void);
void gdict_sidebar_add_page (GdictSidebar * sidebar,
- const gchar * page_id,
- const gchar * page_name,
- GtkWidget * page_widget);
+ const gchar * page_id,
+ const gchar * page_name,
+ GtkWidget * page_widget);
void gdict_sidebar_remove_page (GdictSidebar * sidebar,
- const gchar * page_id);
+ const gchar * page_id);
void gdict_sidebar_view_page (GdictSidebar * sidebar,
- const gchar * page_id);
+ const gchar * page_id);
G_CONST_RETURN gchar *gdict_sidebar_current_page (GdictSidebar *
- sidebar);
+ sidebar);
gchar **gdict_sidebar_list_pages (GdictSidebar * sidebar,
- gsize * length) G_GNUC_MALLOC;
+ gsize * length) G_GNUC_MALLOC;
#endif /* __GDICT_SIDEBAR_H__ */
diff --git a/plugins/fullscreen/gtr-fullscreen-plugin.c b/plugins/fullscreen/gtr-fullscreen-plugin.c
index bc0b4b8..7101487 100644
--- a/plugins/fullscreen/gtr-fullscreen-plugin.c
+++ b/plugins/fullscreen/gtr-fullscreen-plugin.c
@@ -30,10 +30,9 @@
#define WINDOW_DATA_KEY "GtrFullscreenPluginWindowData"
#define MENU_PATH "/MainMenu/ViewMenu/ViewOps_1"
-GTR_PLUGIN_REGISTER_TYPE (GtrFullscreenPlugin,
- gtr_fullscreen_plugin)
+GTR_PLUGIN_REGISTER_TYPE (GtrFullscreenPlugin, gtr_fullscreen_plugin)
static void on_fullscreen_activated (GtkToggleAction * action,
- GtrWindow * window)
+ GtrWindow * window)
{
if (gtk_toggle_action_get_active (action))
gtk_window_fullscreen (GTK_WINDOW (window));
@@ -62,16 +61,14 @@ free_window_data (WindowData * data)
}
static void
-gtr_fullscreen_plugin_init (GtrFullscreenPlugin *
- message_table)
+gtr_fullscreen_plugin_init (GtrFullscreenPlugin * message_table)
{
}
static void
gtr_fullscreen_plugin_finalize (GObject * object)
{
- G_OBJECT_CLASS (gtr_fullscreen_plugin_parent_class)->
- finalize (object);
+ G_OBJECT_CLASS (gtr_fullscreen_plugin_parent_class)->finalize (object);
}
static void
@@ -87,12 +84,11 @@ impl_activate (GtrPlugin * plugin, GtrWindow * window)
manager = gtr_window_get_ui_manager (window);
- data->action_group =
- gtk_action_group_new ("GtrFullscreenPluginActions");
+ data->action_group = gtk_action_group_new ("GtrFullscreenPluginActions");
gtk_action_group_set_translation_domain (data->action_group,
- GETTEXT_PACKAGE);
+ GETTEXT_PACKAGE);
gtk_action_group_add_toggle_actions (data->action_group, action_entries,
- G_N_ELEMENTS (action_entries), window);
+ G_N_ELEMENTS (action_entries), window);
gtk_ui_manager_insert_action_group (manager, data->action_group, -1);
@@ -107,14 +103,14 @@ impl_activate (GtrPlugin * plugin, GtrWindow * window)
}
g_object_set_data_full (G_OBJECT (window),
- WINDOW_DATA_KEY,
- data, (GDestroyNotify) free_window_data);
+ WINDOW_DATA_KEY,
+ data, (GDestroyNotify) free_window_data);
gtk_ui_manager_add_ui (manager,
- data->ui_id,
- MENU_PATH,
- "Fullscreen",
- "Fullscreen", GTK_UI_MANAGER_MENUITEM, FALSE);
+ data->ui_id,
+ MENU_PATH,
+ "Fullscreen",
+ "Fullscreen", GTK_UI_MANAGER_MENUITEM, FALSE);
}
static void
@@ -136,8 +132,7 @@ impl_deactivate (GtrPlugin * plugin, GtrWindow * window)
}
static void
-gtr_fullscreen_plugin_class_init (GtrFullscreenPluginClass *
- klass)
+gtr_fullscreen_plugin_class_init (GtrFullscreenPluginClass * klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GtrPluginClass *plugin_class = GTR_PLUGIN_CLASS (klass);
diff --git a/plugins/fullscreen/gtr-fullscreen-plugin.h b/plugins/fullscreen/gtr-fullscreen-plugin.h
index bc516af..8973f00 100644
--- a/plugins/fullscreen/gtr-fullscreen-plugin.h
+++ b/plugins/fullscreen/gtr-fullscreen-plugin.h
@@ -35,8 +35,7 @@ G_BEGIN_DECLS
#define GTR_IS_FULLSCREEN_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_FULLSCREEN_PLUGIN))
#define GTR_FULLSCREEN_PLUGIN_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_FULLSCREEN_PLUGIN_PLUGIN, GtrFullscreenPluginClass))
/* Private structure type */
-typedef struct _GtrFullscreenPluginPrivate
- GtrFullscreenPluginPrivate;
+typedef struct _GtrFullscreenPluginPrivate GtrFullscreenPluginPrivate;
/*
* Main object structure
@@ -51,8 +50,7 @@ struct _GtrFullscreenPlugin
/*
* Class definition
*/
-typedef struct _GtrFullscreenPluginClass
- GtrFullscreenPluginClass;
+typedef struct _GtrFullscreenPluginClass GtrFullscreenPluginClass;
struct _GtrFullscreenPluginClass
{
diff --git a/plugins/glossary/glossary-panel.c b/plugins/glossary/glossary-panel.c
index 6960fe7..4fc103e 100644
--- a/plugins/glossary/glossary-panel.c
+++ b/plugins/glossary/glossary-panel.c
@@ -37,8 +37,7 @@
GTR_TYPE_GLOSSARY_PANEL, \
GtrGlossaryPanelPrivate))
-G_DEFINE_TYPE (GtrGlossaryPanel, gtr_glossary_panel,
- GTK_TYPE_VBOX)
+G_DEFINE_TYPE (GtrGlossaryPanel, gtr_glossary_panel, GTK_TYPE_VBOX)
#define XML_FILE_NAME "glossary.xml"
/*
* TreeItem structure
@@ -102,11 +101,11 @@ G_DEFINE_TYPE (GtrGlossaryPanel, gtr_glossary_panel,
while (cur != NULL)
{
if ((!xmlStrcmp (cur->name, (const xmlChar *) "Person")) &&
- (cur->ns == ns))
- ret->name = xmlNodeListGetString (doc, cur->xmlChildrenNode, 1);
+ (cur->ns == ns))
+ ret->name = xmlNodeListGetString (doc, cur->xmlChildrenNode, 1);
if ((!xmlStrcmp (cur->name, (const xmlChar *) "Email")) &&
- (cur->ns == ns))
- ret->email = xmlNodeListGetString (doc, cur->xmlChildrenNode, 1);
+ (cur->ns == ns))
+ ret->email = xmlNodeListGetString (doc, cur->xmlChildrenNode, 1);
cur = cur->next;
}
diff --git a/plugins/glossary/glossary-panel.h b/plugins/glossary/glossary-panel.h
index 3470c68..3b94366 100644
--- a/plugins/glossary/glossary-panel.h
+++ b/plugins/glossary/glossary-panel.h
@@ -39,8 +39,7 @@ G_BEGIN_DECLS
#define GTR_IS_GLOSSARY_PANEL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_GLOSSARY_PANEL))
#define GTR_GLOSSARY_PANEL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_GLOSSARY_PANEL, GtrGlossaryPanelClass))
/* Private structure type */
-typedef struct _GtrGlossaryPanelPrivate
- GtrGlossaryPanelPrivate;
+typedef struct _GtrGlossaryPanelPrivate GtrGlossaryPanelPrivate;
/*
* Main object structure
diff --git a/plugins/insert-params/gtr-insert-params-plugin.c b/plugins/insert-params/gtr-insert-params-plugin.c
index 2289b19..f967847 100644
--- a/plugins/insert-params/gtr-insert-params-plugin.c
+++ b/plugins/insert-params/gtr-insert-params-plugin.c
@@ -31,17 +31,16 @@
#define WINDOW_DATA_KEY "GtrInsertParamsPluginWindowData"
-GTR_PLUGIN_REGISTER_TYPE (GtrInsertParamsPlugin,
- gtr_insert_params_plugin)
+GTR_PLUGIN_REGISTER_TYPE (GtrInsertParamsPlugin, gtr_insert_params_plugin)
static GSList *params = NULL;
static gint param_position;
- static const gchar param_regex[] = "\\%\\%|\\%" "(?:[1-9][0-9]*\\$)?" // argument
- "[#0\\-\\ \\+\\'I]*" // flags
- "(?:[1-9][0-9]*|\\*)?" // width
- "(?:\\.\\-?(?:[0-9]+|\\*))?" // precision
- "(?:hh|ll|[hlLqjzt])?" // length modifier
- "[diouxXeEfFgGaAcsCSpnm]"; // conversion specifier
+ static const gchar param_regex[] = "\\%\\%|\\%" "(?:[1-9][0-9]*\\$)?" // argument
+ "[#0\\-\\ \\+\\'I]*" // flags
+ "(?:[1-9][0-9]*|\\*)?" // width
+ "(?:\\.\\-?(?:[0-9]+|\\*))?" // precision
+ "(?:hh|ll|[hlLqjzt])?" // length modifier
+ "[diouxXeEfFgGaAcsCSpnm]"; // conversion specifier
static void
on_next_tag_activated (GtkAction * action, GtrWindow * window)
@@ -64,8 +63,8 @@ GTR_PLUGIN_REGISTER_TYPE (GtrInsertParamsPlugin,
gtk_text_buffer_begin_user_action (buffer);
gtk_text_buffer_insert_at_cursor (buffer,
- (const gchar *) param->data,
- strlen (param->data));
+ (const gchar *) param->data,
+ strlen (param->data));
gtk_text_buffer_end_user_action (buffer);
param_position++;
@@ -111,18 +110,17 @@ update_ui_real (GtrWindow * window, WindowData * data)
action = gtk_action_group_get_action (data->action_group, "InsertParams");
gtk_action_set_sensitive (action,
- (view != NULL) &&
- gtk_text_view_get_editable (view));
+ (view != NULL) &&
+ gtk_text_view_get_editable (view));
action = gtk_action_group_get_action (data->action_group, "NextParam");
gtk_action_set_sensitive (action,
- (view != NULL) &&
- gtk_text_view_get_editable (view));
+ (view != NULL) &&
+ gtk_text_view_get_editable (view));
}
static void
-gtr_insert_params_plugin_init (GtrInsertParamsPlugin *
- message_table)
+gtr_insert_params_plugin_init (GtrInsertParamsPlugin * message_table)
{
}
@@ -135,8 +133,7 @@ gtr_insert_params_plugin_finalize (GObject * object)
params = NULL;
}
- G_OBJECT_CLASS (gtr_insert_params_plugin_parent_class)->
- finalize (object);
+ G_OBJECT_CLASS (gtr_insert_params_plugin_parent_class)->finalize (object);
}
static void
@@ -171,9 +168,9 @@ parse_list (GtrWindow * window)
manager = gtr_window_get_ui_manager (window);
insert_params = gtk_ui_manager_get_widget (manager,
- "/MainMenu/EditMenu/EditOps_1/EditInsertParams");
+ "/MainMenu/EditMenu/EditOps_1/EditInsertParams");
next_param = gtk_ui_manager_get_widget (manager,
- "/MainMenu/EditMenu/EditOps_1/EditNextParam");
+ "/MainMenu/EditMenu/EditOps_1/EditNextParam");
if (params == NULL)
{
@@ -193,7 +190,7 @@ parse_list (GtrWindow * window)
gtk_widget_show (menuitem);
g_signal_connect (menuitem, "activate",
- G_CALLBACK (on_menuitem_activated), window);
+ G_CALLBACK (on_menuitem_activated), window);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
}
@@ -203,8 +200,7 @@ parse_list (GtrWindow * window)
}
static void
-showed_message_cb (GtrTab * tab,
- GtrMsg * msg, GtrWindow * window)
+showed_message_cb (GtrTab * tab, GtrMsg * msg, GtrWindow * window)
{
const gchar *msgid;
GRegex *regex;
@@ -239,22 +235,22 @@ showed_message_cb (GtrTab * tab,
word = g_match_info_fetch (match_info, 0);
word_collate = g_utf8_collate_key (word, -1);
for (i = 0; i < g_slist_length (params); i++)
- {
- gchar *param_collate;
- gchar *param = g_slist_nth_data (params, i);
-
- param_collate = g_utf8_collate_key (param, -1);
- if (strcmp (param_collate, word_collate) == 0)
- {
- g_free (word);
- word = NULL;
- }
- g_free (param_collate);
- }
+ {
+ gchar *param_collate;
+ gchar *param = g_slist_nth_data (params, i);
+
+ param_collate = g_utf8_collate_key (param, -1);
+ if (strcmp (param_collate, word_collate) == 0)
+ {
+ g_free (word);
+ word = NULL;
+ }
+ g_free (param_collate);
+ }
g_free (word_collate);
if (word != NULL)
- params = g_slist_append (params, word);
+ params = g_slist_append (params, word);
g_match_info_next (match_info, NULL);
}
g_match_info_free (match_info);
@@ -266,10 +262,10 @@ showed_message_cb (GtrTab * tab,
static void
page_added_cb (GtkNotebook * notebook,
- GtkWidget * child, guint page_num, GtrWindow * window)
+ GtkWidget * child, guint page_num, GtrWindow * window)
{
g_signal_connect (child, "showed-message",
- G_CALLBACK (showed_message_cb), window);
+ G_CALLBACK (showed_message_cb), window);
}
static void
@@ -287,17 +283,16 @@ impl_activate (GtrPlugin * plugin, GtrWindow * window)
manager = gtr_window_get_ui_manager (window);
- data->action_group =
- gtk_action_group_new ("GtrInsertParamsPluginActions");
+ data->action_group = gtk_action_group_new ("GtrInsertParamsPluginActions");
gtk_action_group_set_translation_domain (data->action_group,
- GETTEXT_PACKAGE);
+ GETTEXT_PACKAGE);
gtk_action_group_add_actions (data->action_group, action_entries,
- G_N_ELEMENTS (action_entries), window);
+ G_N_ELEMENTS (action_entries), window);
gtk_ui_manager_insert_action_group (manager, data->action_group, -1);
data->ui_id = gtk_ui_manager_add_ui_from_string (manager,
- submenu, -1, &error);
+ submenu, -1, &error);
if (error)
{
g_warning ("%s", error->message);
@@ -307,8 +302,8 @@ impl_activate (GtrPlugin * plugin, GtrWindow * window)
}
g_object_set_data_full (G_OBJECT (window),
- WINDOW_DATA_KEY,
- data, (GDestroyNotify) free_window_data);
+ WINDOW_DATA_KEY,
+ data, (GDestroyNotify) free_window_data);
update_ui_real (window, data);
@@ -317,7 +312,7 @@ impl_activate (GtrPlugin * plugin, GtrWindow * window)
notebook = gtr_window_get_notebook (window);
g_signal_connect (GTK_NOTEBOOK (notebook),
- "page-added", G_CALLBACK (page_added_cb), window);
+ "page-added", G_CALLBACK (page_added_cb), window);
tabs = gtr_window_get_all_tabs (window);
@@ -326,7 +321,7 @@ impl_activate (GtrPlugin * plugin, GtrWindow * window)
do
{
g_signal_connect (tabs->data, "showed-message",
- G_CALLBACK (showed_message_cb), window);
+ G_CALLBACK (showed_message_cb), window);
}
while ((tabs = g_list_next (tabs)));
}
@@ -373,8 +368,7 @@ impl_update_ui (GtrPlugin * plugin, GtrWindow * window)
}
static void
-gtr_insert_params_plugin_class_init
- (GtrInsertParamsPluginClass * klass)
+ gtr_insert_params_plugin_class_init (GtrInsertParamsPluginClass * klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GtrPluginClass *plugin_class = GTR_PLUGIN_CLASS (klass);
diff --git a/plugins/insert-params/gtr-insert-params-plugin.h b/plugins/insert-params/gtr-insert-params-plugin.h
index 49cc1e6..4edfab4 100644
--- a/plugins/insert-params/gtr-insert-params-plugin.h
+++ b/plugins/insert-params/gtr-insert-params-plugin.h
@@ -35,8 +35,7 @@ G_BEGIN_DECLS
#define GTR_IS_INSERT_PARAMS_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_INSERT_PARAMS_PLUGIN))
#define GTR_INSERT_PARAMS_PLUGIN_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_INSERT_PARAMS_PLUGIN_PLUGIN, GtrInsertParamsPluginClass))
/* Private structure type */
-typedef struct _GtrInsertParamsPluginPrivate
- GtrInsertParamsPluginPrivate;
+typedef struct _GtrInsertParamsPluginPrivate GtrInsertParamsPluginPrivate;
/*
* Main object structure
@@ -51,8 +50,7 @@ struct _GtrInsertParamsPlugin
/*
* Class definition
*/
-typedef struct _GtrInsertParamsPluginClass
- GtrInsertParamsPluginClass;
+typedef struct _GtrInsertParamsPluginClass GtrInsertParamsPluginClass;
struct _GtrInsertParamsPluginClass
{
diff --git a/plugins/insert-tags/gtr-insert-tags-plugin.c b/plugins/insert-tags/gtr-insert-tags-plugin.c
index 2634302..e56d7f4 100644
--- a/plugins/insert-tags/gtr-insert-tags-plugin.c
+++ b/plugins/insert-tags/gtr-insert-tags-plugin.c
@@ -31,8 +31,7 @@
#define WINDOW_DATA_KEY "GtrInsertTagsPluginWindowData"
-GTR_PLUGIN_REGISTER_TYPE (GtrInsertTagsPlugin,
- gtr_insert_tags_plugin)
+GTR_PLUGIN_REGISTER_TYPE (GtrInsertTagsPlugin, gtr_insert_tags_plugin)
static GSList *tags = NULL;
static gint tag_position;
@@ -57,8 +56,8 @@ GTR_PLUGIN_REGISTER_TYPE (GtrInsertTagsPlugin,
gtk_text_buffer_begin_user_action (buffer);
gtk_text_buffer_insert_at_cursor (buffer,
- (const gchar *) tag->data,
- strlen (tag->data));
+ (const gchar *) tag->data,
+ strlen (tag->data));
gtk_text_buffer_end_user_action (buffer);
tag_position++;
@@ -104,18 +103,17 @@ update_ui_real (GtrWindow * window, WindowData * data)
action = gtk_action_group_get_action (data->action_group, "InsertTags");
gtk_action_set_sensitive (action,
- (view != NULL) &&
- gtk_text_view_get_editable (view));
+ (view != NULL) &&
+ gtk_text_view_get_editable (view));
action = gtk_action_group_get_action (data->action_group, "NextTag");
gtk_action_set_sensitive (action,
- (view != NULL) &&
- gtk_text_view_get_editable (view));
+ (view != NULL) &&
+ gtk_text_view_get_editable (view));
}
static void
-gtr_insert_tags_plugin_init (GtrInsertTagsPlugin *
- message_table)
+gtr_insert_tags_plugin_init (GtrInsertTagsPlugin * message_table)
{
}
@@ -128,8 +126,7 @@ gtr_insert_tags_plugin_finalize (GObject * object)
tags = NULL;
}
- G_OBJECT_CLASS (gtr_insert_tags_plugin_parent_class)->
- finalize (object);
+ G_OBJECT_CLASS (gtr_insert_tags_plugin_parent_class)->finalize (object);
}
static void
@@ -164,9 +161,9 @@ parse_list (GtrWindow * window)
manager = gtr_window_get_ui_manager (window);
insert_tags = gtk_ui_manager_get_widget (manager,
- "/MainMenu/EditMenu/EditOps_1/EditInsertTags");
+ "/MainMenu/EditMenu/EditOps_1/EditInsertTags");
next_tag = gtk_ui_manager_get_widget (manager,
- "/MainMenu/EditMenu/EditOps_1/EditNextTag");
+ "/MainMenu/EditMenu/EditOps_1/EditNextTag");
if (tags == NULL)
{
@@ -187,7 +184,7 @@ parse_list (GtrWindow * window)
gtk_widget_show (menuitem);
g_signal_connect (menuitem, "activate",
- G_CALLBACK (on_menuitem_activated), window);
+ G_CALLBACK (on_menuitem_activated), window);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
}
@@ -197,8 +194,7 @@ parse_list (GtrWindow * window)
}
static void
-showed_message_cb (GtrTab * tab,
- GtrMsg * msg, GtrWindow * window)
+showed_message_cb (GtrTab * tab, GtrMsg * msg, GtrWindow * window)
{
const gchar *msgid;
GRegex *regex;
@@ -241,10 +237,10 @@ showed_message_cb (GtrTab * tab,
static void
page_added_cb (GtkNotebook * notebook,
- GtkWidget * child, guint page_num, GtrWindow * window)
+ GtkWidget * child, guint page_num, GtrWindow * window)
{
g_signal_connect (child, "showed-message",
- G_CALLBACK (showed_message_cb), window);
+ G_CALLBACK (showed_message_cb), window);
}
static void
@@ -262,17 +258,16 @@ impl_activate (GtrPlugin * plugin, GtrWindow * window)
manager = gtr_window_get_ui_manager (window);
- data->action_group =
- gtk_action_group_new ("GtrInsertTagsPluginActions");
+ data->action_group = gtk_action_group_new ("GtrInsertTagsPluginActions");
gtk_action_group_set_translation_domain (data->action_group,
- GETTEXT_PACKAGE);
+ GETTEXT_PACKAGE);
gtk_action_group_add_actions (data->action_group, action_entries,
- G_N_ELEMENTS (action_entries), window);
+ G_N_ELEMENTS (action_entries), window);
gtk_ui_manager_insert_action_group (manager, data->action_group, -1);
data->ui_id = gtk_ui_manager_add_ui_from_string (manager,
- submenu, -1, &error);
+ submenu, -1, &error);
if (error)
{
g_warning ("%s", error->message);
@@ -282,8 +277,8 @@ impl_activate (GtrPlugin * plugin, GtrWindow * window)
}
g_object_set_data_full (G_OBJECT (window),
- WINDOW_DATA_KEY,
- data, (GDestroyNotify) free_window_data);
+ WINDOW_DATA_KEY,
+ data, (GDestroyNotify) free_window_data);
update_ui_real (window, data);
@@ -292,7 +287,7 @@ impl_activate (GtrPlugin * plugin, GtrWindow * window)
notebook = gtr_window_get_notebook (window);
g_signal_connect (GTK_NOTEBOOK (notebook),
- "page-added", G_CALLBACK (page_added_cb), window);
+ "page-added", G_CALLBACK (page_added_cb), window);
tabs = gtr_window_get_all_tabs (window);
@@ -301,7 +296,7 @@ impl_activate (GtrPlugin * plugin, GtrWindow * window)
do
{
g_signal_connect (tabs->data, "showed-message",
- G_CALLBACK (showed_message_cb), window);
+ G_CALLBACK (showed_message_cb), window);
}
while ((tabs = g_list_next (tabs)));
}
@@ -348,8 +343,7 @@ impl_update_ui (GtrPlugin * plugin, GtrWindow * window)
}
static void
-gtr_insert_tags_plugin_class_init (GtrInsertTagsPluginClass *
- klass)
+gtr_insert_tags_plugin_class_init (GtrInsertTagsPluginClass * klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GtrPluginClass *plugin_class = GTR_PLUGIN_CLASS (klass);
diff --git a/plugins/insert-tags/gtr-insert-tags-plugin.h b/plugins/insert-tags/gtr-insert-tags-plugin.h
index eed9a9c..d5716f0 100644
--- a/plugins/insert-tags/gtr-insert-tags-plugin.h
+++ b/plugins/insert-tags/gtr-insert-tags-plugin.h
@@ -35,8 +35,7 @@ G_BEGIN_DECLS
#define GTR_IS_INSERT_TAGS_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_INSERT_TAGS_PLUGIN))
#define GTR_INSERT_TAGS_PLUGIN_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_INSERT_TAGS_PLUGIN_PLUGIN, GtrInsertTagsPluginClass))
/* Private structure type */
-typedef struct _GtrInsertTagsPluginPrivate
- GtrInsertTagsPluginPrivate;
+typedef struct _GtrInsertTagsPluginPrivate GtrInsertTagsPluginPrivate;
/*
* Main object structure
@@ -51,8 +50,7 @@ struct _GtrInsertTagsPlugin
/*
* Class definition
*/
-typedef struct _GtrInsertTagsPluginClass
- GtrInsertTagsPluginClass;
+typedef struct _GtrInsertTagsPluginClass GtrInsertTagsPluginClass;
struct _GtrInsertTagsPluginClass
{
diff --git a/plugins/open-tran/gtr-open-tran-panel.c b/plugins/open-tran/gtr-open-tran-panel.c
index 1c49dd2..7490bfe 100644
--- a/plugins/open-tran/gtr-open-tran-panel.c
+++ b/plugins/open-tran/gtr-open-tran-panel.c
@@ -49,36 +49,33 @@
#define OPEN_OFFICE_ICON PIXMAPSDIR"/oo-logo.png"
#define FEDORA_ICON PIXMAPSDIR"/fedora.png"
-GTR_PLUGIN_DEFINE_TYPE (GtrOpenTranPanel, gtr_open_tran_panel,
- GTK_TYPE_VBOX)
+GTR_PLUGIN_DEFINE_TYPE (GtrOpenTranPanel, gtr_open_tran_panel, GTK_TYPE_VBOX)
+ struct _GtrOpenTranPanelPrivate
+ {
+ GConfClient *gconf_client;
-struct _GtrOpenTranPanelPrivate
-{
- GConfClient *gconf_client;
-
- GtkWidget *treeview;
- GtkListStore *store;
+ GtkWidget *treeview;
+ GtkListStore *store;
- GtkWidget *entry;
+ GtkWidget *entry;
- SoupSession *session;
+ SoupSession *session;
- GtrWindow *window;
+ GtrWindow *window;
- gchar *text;
-};
+ gchar *text;
+ };
-enum
-{
- ICON_COLUMN,
- TEXT_COLUMN,
- N_COLUMNS
-};
+ enum
+ {
+ ICON_COLUMN,
+ TEXT_COLUMN,
+ N_COLUMNS
+ };
-static void
-show_error_dialog (GtrWindow * parent,
- const gchar * message_format,
- ...)
+ static void
+ show_error_dialog (GtrWindow * parent,
+ const gchar * message_format, ...)
{
gchar *msg = NULL;
va_list args;
@@ -89,13 +86,13 @@ show_error_dialog (GtrWindow * parent,
va_end (args);
dialog = gtk_message_dialog_new (GTK_WINDOW (parent),
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_CLOSE, "%s", msg);
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_CLOSE, "%s", msg);
g_free (msg);
g_signal_connect (dialog, "response",
- G_CALLBACK (gtk_widget_destroy), &dialog);
+ G_CALLBACK (gtk_widget_destroy), &dialog);
gtk_widget_show (dialog);
}
@@ -118,8 +115,7 @@ create_pixbuf (const gchar * path)
}
static void
-print_struct_to_tree_view (const gchar * str,
- GtrOpenTranPanel * panel)
+print_struct_to_tree_view (const gchar * str, GtrOpenTranPanel * panel)
{
GdkPixbuf *icon;
GtkTreeIter iter;
@@ -150,7 +146,7 @@ print_struct_to_tree_view (const gchar * str,
gtk_list_store_append (panel->priv->store, &iter);
gtk_list_store_set (panel->priv->store, &iter,
- ICON_COLUMN, icon, TEXT_COLUMN, panel->priv->text, -1);
+ ICON_COLUMN, icon, TEXT_COLUMN, panel->priv->text, -1);
g_free (panel->priv->text);
@@ -180,17 +176,17 @@ print_struct_field (gpointer key, gpointer value, gpointer data)
array = g_value_get_boxed (value);
if (G_VALUE_HOLDS (array->values, G_TYPE_HASH_TABLE))
- {
- gpointer name;
+ {
+ gpointer name;
- hash = g_value_get_boxed (array->values);
- name = g_hash_table_lookup (hash, "name");
+ hash = g_value_get_boxed (array->values);
+ name = g_hash_table_lookup (hash, "name");
- if (name != NULL)
- {
- print_struct_to_tree_view (g_value_get_string (name), panel);
- }
- }
+ if (name != NULL)
+ {
+ print_struct_to_tree_view (g_value_get_string (name), panel);
+ }
+ }
/*
* It's important freeing the array after the use of its contents
@@ -216,8 +212,8 @@ check_xmlrpc (GValue * value, GType type, ...)
static void
open_connection (GtrOpenTranPanel * panel,
- const gchar * text,
- const gchar * search_code, const gchar * own_code)
+ const gchar * text,
+ const gchar * search_code, const gchar * own_code)
{
const gchar *uri = "http://open-tran.eu/RPC2";;
SoupMessage *msg;
@@ -230,11 +226,11 @@ open_connection (GtrOpenTranPanel * panel,
gint i;
array = soup_value_array_new_with_vals (G_TYPE_STRING, text,
- G_TYPE_STRING, search_code,
- G_TYPE_STRING, own_code, NULL);
+ G_TYPE_STRING, search_code,
+ G_TYPE_STRING, own_code, NULL);
body = soup_xmlrpc_build_method_call ("suggest2", array->values,
- array->n_values);
+ array->n_values);
g_value_array_free (array);
@@ -243,31 +239,31 @@ open_connection (GtrOpenTranPanel * panel,
msg = soup_message_new ("POST", uri);
soup_message_set_request (msg, "text/xml", SOUP_MEMORY_TAKE,
- body, strlen (body));
+ body, strlen (body));
soup_session_send_message (panel->priv->session, msg);
if (!SOUP_STATUS_IS_SUCCESSFUL (msg->status_code))
{
show_error_dialog (panel->priv->window,
- _("ERROR: %d %s\n"), msg->status_code,
- msg->reason_phrase);
+ _("ERROR: %d %s\n"), msg->status_code,
+ msg->reason_phrase);
g_object_unref (msg);
return;
}
if (!soup_xmlrpc_parse_method_response (msg->response_body->data,
- msg->response_body->length,
- &retval, &err))
+ msg->response_body->length,
+ &retval, &err))
{
if (err)
- {
- show_error_dialog (panel->priv->window,
- _("FAULT: %d %s\n"), err->code, err->message);
- g_error_free (err);
- }
+ {
+ show_error_dialog (panel->priv->window,
+ _("FAULT: %d %s\n"), err->code, err->message);
+ g_error_free (err);
+ }
else
- show_error_dialog (panel->priv->window,
- _("ERROR: could not parse response\n"));
+ show_error_dialog (panel->priv->window,
+ _("ERROR: could not parse response\n"));
g_object_unref (msg);
return;
@@ -284,24 +280,24 @@ open_connection (GtrOpenTranPanel * panel,
for (i = 0; i < array->n_values; i++)
{
if (!soup_value_array_get_nth (array, i, G_TYPE_HASH_TABLE, &result))
- {
- show_error_dialog (panel->priv->window,
- _("WRONG! Can't get result element %d\n"),
- i + 1);
- break;
- }
+ {
+ show_error_dialog (panel->priv->window,
+ _("WRONG! Can't get result element %d\n"),
+ i + 1);
+ break;
+ }
g_hash_table_foreach (result, print_struct_field, panel);
}
/* We have to check if we didn't find any text */
if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (panel->priv->store),
- &treeiter))
+ &treeiter))
{
gtk_list_store_append (panel->priv->store, &treeiter);
gtk_list_store_set (panel->priv->store, &treeiter,
- ICON_COLUMN, NULL,
- TEXT_COLUMN, _("Phrase not found"), -1);
+ ICON_COLUMN, NULL,
+ TEXT_COLUMN, _("Phrase not found"), -1);
}
soup_session_abort (panel->priv->session);
@@ -320,26 +316,26 @@ entry_activate_cb (GtkEntry * entry, GtrOpenTranPanel * panel)
if (!entry_text)
{
show_error_dialog (panel->priv->window,
- _("You have to provide a phrase to search"));
+ _("You have to provide a phrase to search"));
return;
}
search_code = gconf_client_get_string (panel->priv->gconf_client,
- SEARCH_CODE_KEY, NULL);
+ SEARCH_CODE_KEY, NULL);
if (!search_code)
{
show_error_dialog (panel->priv->window,
- _("You have to provide a search language code"));
+ _("You have to provide a search language code"));
return;
}
own_code = gconf_client_get_string (panel->priv->gconf_client,
- OWN_CODE_KEY, NULL);
+ OWN_CODE_KEY, NULL);
if (!own_code)
{
show_error_dialog (panel->priv->window,
- _
- ("You have to provide a language code for your language"));
+ _
+ ("You have to provide a language code for your language"));
return;
}
@@ -355,7 +351,7 @@ gtr_open_tran_panel_draw_treeview (GtrOpenTranPanel * panel)
GtrOpenTranPanelPrivate *priv = panel->priv;
priv->store = gtk_list_store_new (N_COLUMNS,
- GDK_TYPE_PIXBUF, G_TYPE_STRING);
+ GDK_TYPE_PIXBUF, G_TYPE_STRING);
priv->treeview =
gtk_tree_view_new_with_model (GTK_TREE_MODEL (priv->store));
@@ -368,8 +364,8 @@ gtr_open_tran_panel_draw_treeview (GtrOpenTranPanel * panel)
renderer = gtk_cell_renderer_pixbuf_new ();
column = gtk_tree_view_column_new_with_attributes (_("Type"),
- renderer, "pixbuf",
- ICON_COLUMN, NULL);
+ renderer, "pixbuf",
+ ICON_COLUMN, NULL);
gtk_tree_view_column_set_resizable (column, FALSE);
gtk_tree_view_append_column (GTK_TREE_VIEW (priv->treeview), column);
@@ -379,9 +375,9 @@ gtr_open_tran_panel_draw_treeview (GtrOpenTranPanel * panel)
column = gtk_tree_view_column_new ();
renderer = gtk_cell_renderer_text_new ();
column = gtk_tree_view_column_new_with_attributes (_("Open-Tran.eu"),
- renderer,
- "text", TEXT_COLUMN,
- NULL);
+ renderer,
+ "text", TEXT_COLUMN,
+ NULL);
gtk_tree_view_column_set_resizable (column, FALSE);
gtk_tree_view_append_column (GTK_TREE_VIEW (priv->treeview), column);
@@ -399,9 +395,9 @@ gtr_open_tran_panel_draw (GtrOpenTranPanel * panel)
*/
scrolledwindow = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow),
- GTK_SHADOW_IN);
+ GTK_SHADOW_IN);
gtk_box_pack_start (GTK_BOX (panel), scrolledwindow, TRUE, TRUE, 0);
/*
@@ -424,7 +420,7 @@ gtr_open_tran_panel_draw (GtrOpenTranPanel * panel)
panel->priv->entry = gtk_entry_new ();
gtk_box_pack_start (GTK_BOX (hbox), panel->priv->entry, TRUE, TRUE, 0);
g_signal_connect (panel->priv->entry, "activate",
- G_CALLBACK (entry_activate_cb), panel);
+ G_CALLBACK (entry_activate_cb), panel);
gtk_box_pack_start (GTK_BOX (panel), hbox, FALSE, TRUE, 0);
}
diff --git a/plugins/open-tran/gtr-open-tran-panel.h b/plugins/open-tran/gtr-open-tran-panel.h
index 5cb16ea..fb1dcf3 100644
--- a/plugins/open-tran/gtr-open-tran-panel.h
+++ b/plugins/open-tran/gtr-open-tran-panel.h
@@ -40,8 +40,7 @@ G_BEGIN_DECLS
#define SEARCH_CODE_KEY OPEN_TRAN_BASE_KEY "/search_code"
#define OWN_CODE_KEY OPEN_TRAN_BASE_KEY "/own_code"
/* Private structure type */
-typedef struct _GtrOpenTranPanelPrivate
- GtrOpenTranPanelPrivate;
+typedef struct _GtrOpenTranPanelPrivate GtrOpenTranPanelPrivate;
/*
* Main object structure
diff --git a/plugins/open-tran/gtr-open-tran-plugin.c b/plugins/open-tran/gtr-open-tran-plugin.c
index 9037a2f..0a0aba1 100644
--- a/plugins/open-tran/gtr-open-tran-plugin.c
+++ b/plugins/open-tran/gtr-open-tran-plugin.c
@@ -59,19 +59,19 @@ typedef struct
} WindowData;
GTR_PLUGIN_REGISTER_TYPE_WITH_CODE (GtrOpenTranPlugin,
- gtr_open_tran_plugin,
- gtr_open_tran_panel_register_type
- (module);)
- static void gtr_open_tran_plugin_init (GtrOpenTranPlugin
- * plugin)
+ gtr_open_tran_plugin,
+ gtr_open_tran_panel_register_type
+ (module);
+ )
+ static void gtr_open_tran_plugin_init (GtrOpenTranPlugin * plugin)
{
plugin->priv = GTR_OPEN_TRAN_PLUGIN_GET_PRIVATE (plugin);
plugin->priv->gconf_client = gconf_client_get_default ();
gconf_client_add_dir (plugin->priv->gconf_client,
- OPEN_TRAN_BASE_KEY,
- GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
+ OPEN_TRAN_BASE_KEY,
+ GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
}
static void
@@ -83,8 +83,7 @@ gtr_open_tran_plugin_finalize (GObject * object)
g_object_unref (G_OBJECT (plugin->priv->gconf_client));
- G_OBJECT_CLASS (gtr_open_tran_plugin_parent_class)->
- finalize (object);
+ G_OBJECT_CLASS (gtr_open_tran_plugin_parent_class)->finalize (object);
}
@@ -94,17 +93,16 @@ impl_activate (GtrPlugin * plugin, GtrWindow * window)
GtkWidget *opentran;
gtr_application_register_icon (GTR_APP, "open-tran.png",
- "open-tran-plugin-icon");
+ "open-tran-plugin-icon");
opentran = gtr_open_tran_panel_new (window);
gtk_widget_show (opentran);
gtr_window_add_widget (window,
- opentran,
- "GtrOpenTranPlugin",
- _("Open Tran"),
- "open-tran-plugin-icon",
- GTR_WINDOW_PLACEMENT_LEFT);
+ opentran,
+ "GtrOpenTranPlugin",
+ _("Open Tran"),
+ "open-tran-plugin-icon", GTR_WINDOW_PLACEMENT_LEFT);
g_object_set_data (G_OBJECT (window), WINDOW_DATA_KEY, opentran);
}
@@ -115,7 +113,7 @@ impl_deactivate (GtrPlugin * plugin, GtrWindow * window)
GtkWidget *opentran;
opentran = (GtkWidget *) g_object_get_data (G_OBJECT (window),
- WINDOW_DATA_KEY);
+ WINDOW_DATA_KEY);
g_return_if_fail (opentran != NULL);
gtr_window_remove_widget (window, opentran);
@@ -141,7 +139,7 @@ get_custom_code (GtrOpenTranPlugin * plugin, gboolean own_code)
if (!code && !own_code)
code = g_strdup ("en");
else if (!code && own_code)
- code = g_strdup ("gl"); //Why gl? Just because i want.
+ code = g_strdup ("gl"); //Why gl? Just because i want.
if (!own_code)
gtk_entry_set_text (GTK_ENTRY (plugin->priv->search_code_entry), code);
@@ -165,15 +163,14 @@ get_configuration_dialog (GtrOpenTranPlugin * plugin)
path = gtr_dirs_get_ui_file ("gtr-open-tran-dialog.ui");
ret = gtr_utils_get_ui_objects (path,
- root_objects,
- &error_widget,
- "dialog", &plugin->priv->dialog,
- "main_box", &plugin->priv->main_box,
- "search_code",
- &plugin->priv->search_code_entry,
- "own_code",
- &plugin->priv->own_code_entry,
- NULL);
+ root_objects,
+ &error_widget,
+ "dialog", &plugin->priv->dialog,
+ "main_box", &plugin->priv->main_box,
+ "search_code",
+ &plugin->priv->search_code_entry,
+ "own_code",
+ &plugin->priv->own_code_entry, NULL);
g_free (path);
if (!ret)
@@ -200,37 +197,36 @@ ok_button_pressed (GtrOpenTranPlugin * plugin)
/* Now we store the data in gconf */
if (!gconf_client_key_is_writable (plugin->priv->gconf_client,
- SEARCH_CODE_KEY, NULL))
+ SEARCH_CODE_KEY, NULL))
return;
gconf_client_set_string (plugin->priv->gconf_client,
- SEARCH_CODE_KEY, search_code, NULL);
+ SEARCH_CODE_KEY, search_code, NULL);
if (!gconf_client_key_is_writable (plugin->priv->gconf_client,
- OWN_CODE_KEY, NULL))
+ OWN_CODE_KEY, NULL))
return;
gconf_client_set_string (plugin->priv->gconf_client,
- OWN_CODE_KEY, own_code, NULL);
+ OWN_CODE_KEY, own_code, NULL);
}
static void
configure_dialog_response_cb (GtkWidget * widget,
- gint response,
- GtrOpenTranPlugin * plugin)
+ gint response, GtrOpenTranPlugin * plugin)
{
switch (response)
{
case GTK_RESPONSE_OK:
{
- ok_button_pressed (plugin);
+ ok_button_pressed (plugin);
- gtk_widget_destroy (plugin->priv->dialog);
- break;
+ gtk_widget_destroy (plugin->priv->dialog);
+ break;
}
case GTK_RESPONSE_CANCEL:
{
- gtk_widget_destroy (plugin->priv->dialog);
+ gtk_widget_destroy (plugin->priv->dialog);
}
}
}
@@ -243,18 +239,17 @@ impl_create_configure_dialog (GtrPlugin * plugin)
dialog = get_configuration_dialog (GTR_OPEN_TRAN_PLUGIN (plugin));
g_signal_connect (dialog,
- "response",
- G_CALLBACK (configure_dialog_response_cb),
- GTR_OPEN_TRAN_PLUGIN (plugin));
+ "response",
+ G_CALLBACK (configure_dialog_response_cb),
+ GTR_OPEN_TRAN_PLUGIN (plugin));
g_signal_connect (dialog,
- "destroy", G_CALLBACK (gtk_widget_destroy), &dialog);
+ "destroy", G_CALLBACK (gtk_widget_destroy), &dialog);
return dialog;
}
static void
-gtr_open_tran_plugin_class_init (GtrOpenTranPluginClass *
- klass)
+gtr_open_tran_plugin_class_init (GtrOpenTranPluginClass * klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GtrPluginClass *plugin_class = GTR_PLUGIN_CLASS (klass);
@@ -265,6 +260,5 @@ gtr_open_tran_plugin_class_init (GtrOpenTranPluginClass *
plugin_class->deactivate = impl_deactivate;
plugin_class->create_configure_dialog = impl_create_configure_dialog;
- g_type_class_add_private (object_class,
- sizeof (GtrOpenTranPluginPrivate));
+ g_type_class_add_private (object_class, sizeof (GtrOpenTranPluginPrivate));
}
diff --git a/plugins/open-tran/gtr-open-tran-plugin.h b/plugins/open-tran/gtr-open-tran-plugin.h
index 51026c7..96eee6a 100644
--- a/plugins/open-tran/gtr-open-tran-plugin.h
+++ b/plugins/open-tran/gtr-open-tran-plugin.h
@@ -35,8 +35,7 @@ G_BEGIN_DECLS
#define GTR_IS_OPEN_TRAN_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_OPEN_TRAN_PLUGIN))
#define GTR_OPEN_TRAN_PLUGIN_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_OPEN_TRAN_PLUGIN, GtrOpenTranPluginClass))
/* Private structure type */
-typedef struct _GtrOpenTranPluginPrivate
- GtrOpenTranPluginPrivate;
+typedef struct _GtrOpenTranPluginPrivate GtrOpenTranPluginPrivate;
/*
* Main object structure
diff --git a/plugins/source-code-view/gtr-source-code-view-plugin.c b/plugins/source-code-view/gtr-source-code-view-plugin.c
index 524670c..e2e2d13 100644
--- a/plugins/source-code-view/gtr-source-code-view-plugin.c
+++ b/plugins/source-code-view/gtr-source-code-view-plugin.c
@@ -64,19 +64,19 @@ struct _GtrSourceCodeViewPluginPrivate
};
GTR_PLUGIN_REGISTER_TYPE (GtrSourceCodeViewPlugin,
- gtr_source_code_view_plugin)
+ gtr_source_code_view_plugin)
static void insert_link (GtkTextBuffer * buffer, GtkTextIter * iter,
- const gchar * path, gint * line,
- GtrSourceCodeViewPlugin * plugin,
- const gchar * msgid)
+ const gchar * path, gint * line,
+ GtrSourceCodeViewPlugin * plugin,
+ const gchar * msgid)
{
GtkTextTag *tag;
gchar *text;
tag = gtk_text_buffer_create_tag (buffer, NULL,
- "foreground", "blue",
- "underline", PANGO_UNDERLINE_SINGLE,
- NULL);
+ "foreground", "blue",
+ "underline", PANGO_UNDERLINE_SINGLE,
+ NULL);
g_object_set_data (G_OBJECT (tag), "path", g_strdup (path));
g_object_set_data (G_OBJECT (tag), "line", line);
g_object_set_data (G_OBJECT (tag), "msgid", g_strdup (msgid));
@@ -90,7 +90,7 @@ GTR_PLUGIN_REGISTER_TYPE (GtrSourceCodeViewPlugin,
static void
show_in_editor (const gchar * program_name,
- const gchar * line_cmd, const gchar * path, gint line)
+ const gchar * line_cmd, const gchar * path, gint line)
{
gchar *open[4];
@@ -103,11 +103,11 @@ show_in_editor (const gchar * program_name,
GtkWidget *dialog;
dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
- GTK_DIALOG_MODAL,
- GTK_BUTTONS_CLOSE,
- _
- ("Please install %s to be able to show the file"),
- program_name);
+ GTK_DIALOG_MODAL,
+ GTK_BUTTONS_CLOSE,
+ _
+ ("Please install %s to be able to show the file"),
+ program_name);
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
}
@@ -117,22 +117,21 @@ show_in_editor (const gchar * program_name,
open[3] = NULL;
gdk_spawn_on_screen (gdk_screen_get_default (),
- NULL,
- open,
- NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL);
+ NULL,
+ open,
+ NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL);
g_free (open[0]);
g_free (open[1]);
g_free (open[2]);
}
static void
-show_source (GtrSourceCodeViewPlugin * plugin,
- const gchar * path, gint line)
+show_source (GtrSourceCodeViewPlugin * plugin, const gchar * path, gint line)
{
gboolean use_editor;
use_editor = gconf_client_get_bool (plugin->priv->gconf_client,
- USE_EDITOR_KEY, NULL);
+ USE_EDITOR_KEY, NULL);
if (use_editor)
{
@@ -141,11 +140,11 @@ show_source (GtrSourceCodeViewPlugin * plugin,
//Program cmd
program_cmd = gconf_client_get_string (plugin->priv->gconf_client,
- PROGRAM_CMD_KEY, NULL);
+ PROGRAM_CMD_KEY, NULL);
//Line cmd
line_cmd = gconf_client_get_string (plugin->priv->gconf_client,
- LINE_CMD_KEY, NULL);
+ LINE_CMD_KEY, NULL);
show_in_editor (program_cmd, line_cmd, path, line);
@@ -195,8 +194,8 @@ get_line_for_text (const gchar * path, const gchar * msgid)
i = str_found + strlen (escaped);
c = *i;
if (!isalpha (c) &&
- !isalpha (*(str_found - 1)) && !(c == ':') && !(c == '_'))
- break;
+ !isalpha (*(str_found - 1)) && !(c == ':') && !(c == '_'))
+ break;
}
if (!str_found)
goto out;
@@ -214,7 +213,7 @@ out:
static void
follow_if_link (GtrSourceCodeViewPlugin * plugin,
- GtkWidget * text_view, GtkTextIter * iter)
+ GtkWidget * text_view, GtkTextIter * iter)
{
GSList *tags = NULL, *tagp = NULL;
GtrTab *tab;
@@ -242,21 +241,21 @@ follow_if_link (GtrSourceCodeViewPlugin * plugin,
GtkTextTag *tag = tagp->data;
gchar *path = g_object_get_data (G_OBJECT (tag), "path");
gint line =
- GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tag), "line"));
+ GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tag), "line"));
fullpath = g_build_filename (dirname, path, NULL);
if (path_is_fake (fullpath))
- {
- gchar *msgid = g_object_get_data (G_OBJECT (tag), "msgid");
+ {
+ gchar *msgid = g_object_get_data (G_OBJECT (tag), "msgid");
- path = g_strdup (fullpath);
- g_free (fullpath);
- fullpath = real_path (path);
- g_free (path);
+ path = g_strdup (fullpath);
+ g_free (fullpath);
+ fullpath = real_path (path);
+ g_free (path);
- line = get_line_for_text (fullpath, msgid);
- }
+ line = get_line_for_text (fullpath, msgid);
+ }
show_source (plugin, fullpath, line);
@@ -271,7 +270,7 @@ follow_if_link (GtrSourceCodeViewPlugin * plugin,
static gboolean
event_after (GtkWidget * text_view,
- GdkEvent * ev, GtrSourceCodeViewPlugin * plugin)
+ GdkEvent * ev, GtrSourceCodeViewPlugin * plugin)
{
GtkTextIter start, end, iter;
GtkTextBuffer *buffer;
@@ -294,8 +293,8 @@ event_after (GtkWidget * text_view,
return FALSE;
gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view),
- GTK_TEXT_WINDOW_WIDGET,
- event->x, event->y, &x, &y);
+ GTK_TEXT_WINDOW_WIDGET,
+ event->x, event->y, &x, &y);
gtk_text_view_get_iter_at_location (GTK_TEXT_VIEW (text_view), &iter, x, y);
@@ -328,10 +327,10 @@ set_cursor_if_appropriate (GtkTextView * text_view, gint x, gint y)
gchar *path = g_object_get_data (G_OBJECT (tag), "path");
if (path)
- {
- hovering = TRUE;
- break;
- }
+ {
+ hovering = TRUE;
+ break;
+ }
}
if (hovering != hovering_over_link)
@@ -339,13 +338,13 @@ set_cursor_if_appropriate (GtkTextView * text_view, gint x, gint y)
hovering_over_link = hovering;
if (hovering_over_link)
- gdk_window_set_cursor (gtk_text_view_get_window (text_view,
- GTK_TEXT_WINDOW_TEXT),
- hand_cursor);
+ gdk_window_set_cursor (gtk_text_view_get_window (text_view,
+ GTK_TEXT_WINDOW_TEXT),
+ hand_cursor);
else
- gdk_window_set_cursor (gtk_text_view_get_window (text_view,
- GTK_TEXT_WINDOW_TEXT),
- regular_cursor);
+ gdk_window_set_cursor (gtk_text_view_get_window (text_view,
+ GTK_TEXT_WINDOW_TEXT),
+ regular_cursor);
}
if (tags)
@@ -361,8 +360,8 @@ motion_notify_event (GtkWidget * text_view, GdkEventMotion * event)
gint x, y;
gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view),
- GTK_TEXT_WINDOW_WIDGET,
- event->x, event->y, &x, &y);
+ GTK_TEXT_WINDOW_WIDGET,
+ event->x, event->y, &x, &y);
set_cursor_if_appropriate (GTK_TEXT_VIEW (text_view), x, y);
@@ -381,8 +380,8 @@ visibility_notify_event (GtkWidget * text_view, GdkEventVisibility * event)
gdk_window_get_pointer (text_view->window, &wx, &wy, NULL);
gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view),
- GTK_TEXT_WINDOW_WIDGET,
- wx, wy, &bx, &by);
+ GTK_TEXT_WINDOW_WIDGET,
+ wx, wy, &bx, &by);
set_cursor_if_appropriate (GTK_TEXT_VIEW (text_view), bx, by);
@@ -390,16 +389,15 @@ visibility_notify_event (GtkWidget * text_view, GdkEventVisibility * event)
}
static void
-gtr_source_code_view_plugin_init (GtrSourceCodeViewPlugin *
- plugin)
+gtr_source_code_view_plugin_init (GtrSourceCodeViewPlugin * plugin)
{
plugin->priv = GTR_SOURCE_CODE_VIEW_PLUGIN_GET_PRIVATE (plugin);
plugin->priv->gconf_client = gconf_client_get_default ();
gconf_client_add_dir (plugin->priv->gconf_client,
- SOURCE_CODE_VIEW_BASE_KEY,
- GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
+ SOURCE_CODE_VIEW_BASE_KEY,
+ GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
plugin->priv->tags = NULL;
}
@@ -407,21 +405,19 @@ gtr_source_code_view_plugin_init (GtrSourceCodeViewPlugin *
static void
gtr_source_code_view_plugin_finalize (GObject * object)
{
- GtrSourceCodeViewPlugin *plugin =
- GTR_SOURCE_CODE_VIEW_PLUGIN (object);
+ GtrSourceCodeViewPlugin *plugin = GTR_SOURCE_CODE_VIEW_PLUGIN (object);
gconf_client_suggest_sync (plugin->priv->gconf_client, NULL);
g_object_unref (G_OBJECT (plugin->priv->gconf_client));
- G_OBJECT_CLASS (gtr_source_code_view_plugin_parent_class)->
- finalize (object);
+ G_OBJECT_CLASS (gtr_source_code_view_plugin_parent_class)->finalize
+ (object);
}
static void
showed_message_cb (GtrTab * tab,
- GtrMsg * msg,
- GtrSourceCodeViewPlugin * plugin)
+ GtrMsg * msg, GtrSourceCodeViewPlugin * plugin)
{
const gchar *filename = NULL;
gint i = 0;
@@ -440,7 +436,7 @@ showed_message_cb (GtrTab * tab,
gtk_text_buffer_get_iter_at_offset (buffer, &iter, 0);
path_start = gtk_text_buffer_create_mark (buffer,
- "path_start", &iter, TRUE);
+ "path_start", &iter, TRUE);
gtk_text_buffer_insert (buffer, &iter, _("Paths:\n"), -1);
filename = gtr_msg_get_filename (msg, i);
@@ -448,7 +444,7 @@ showed_message_cb (GtrTab * tab,
{
line = gtr_msg_get_file_line (msg, i);
insert_link (buffer, &iter, filename, line, plugin,
- gtr_msg_get_msgid (msg));
+ gtr_msg_get_msgid (msg));
i++;
filename = gtr_msg_get_filename (msg, i);
}
@@ -463,8 +459,7 @@ showed_message_cb (GtrTab * tab,
}
static void
-delete_text_and_tags (GtrTab * tab,
- GtrSourceCodeViewPlugin * plugin)
+delete_text_and_tags (GtrTab * tab, GtrSourceCodeViewPlugin * plugin)
{
GSList *tagp = NULL, *tags;
GtkTextBuffer *buffer;
@@ -492,9 +487,9 @@ delete_text_and_tags (GtrTab * tab,
gchar *msgid = g_object_get_data (G_OBJECT (tag), "msgid");
if (path)
- g_free (path);
+ g_free (path);
if (msgid)
- g_free (msgid);
+ g_free (msgid);
}
g_slist_free (tags);
@@ -514,16 +509,15 @@ delete_text_and_tags (GtrTab * tab,
static void
message_edition_finished_cb (GtrTab * tab,
- GtrMsg * msg,
- GtrSourceCodeViewPlugin * plugin)
+ GtrMsg * msg, GtrSourceCodeViewPlugin * plugin)
{
delete_text_and_tags (tab, plugin);
}
static void
page_added_cb (GtkNotebook * notebook,
- GtkWidget * child,
- guint page_num, GtrSourceCodeViewPlugin * plugin)
+ GtkWidget * child,
+ guint page_num, GtrSourceCodeViewPlugin * plugin)
{
GtrContextPanel *panel;
GtkTextView *view;
@@ -534,23 +528,23 @@ page_added_cb (GtkNotebook * notebook,
g_return_if_fail (GTK_IS_TEXT_VIEW (view));
g_signal_connect_after (child, "showed-message",
- G_CALLBACK (showed_message_cb), plugin);
+ G_CALLBACK (showed_message_cb), plugin);
g_signal_connect (child, "message-edition-finished",
- G_CALLBACK (message_edition_finished_cb), plugin);
+ G_CALLBACK (message_edition_finished_cb), plugin);
g_signal_connect (view, "event-after", G_CALLBACK (event_after), plugin);
g_signal_connect (view, "motion-notify-event",
- G_CALLBACK (motion_notify_event), NULL);
+ G_CALLBACK (motion_notify_event), NULL);
g_signal_connect (view, "visibility-notify-event",
- G_CALLBACK (visibility_notify_event), NULL);
+ G_CALLBACK (visibility_notify_event), NULL);
}
static void
use_editor_toggled (GtkToggleButton * button,
- GtrSourceCodeViewPlugin * plugin)
+ GtrSourceCodeViewPlugin * plugin)
{
gtk_widget_set_sensitive (plugin->priv->program_box,
- gtk_toggle_button_get_active (button));
+ gtk_toggle_button_get_active (button));
}
static GtkWidget *
@@ -569,20 +563,18 @@ get_configuration_dialog (GtrSourceCodeViewPlugin * plugin)
path = gtr_dirs_get_ui_file ("gtr-source-code-view-dialog.ui");
ret = gtr_utils_get_ui_objects (path,
- root_objects,
- &error_widget,
- "dialog", &plugin->priv->dialog,
- "main_box", &plugin->priv->main_box,
- "use_editor",
- &plugin->priv->
- use_editor_checkbutton,
- "program_box",
- &plugin->priv->program_box,
- "program_cmd",
- &plugin->priv->program_cmd_entry,
- "line_cmd",
- &plugin->priv->line_cmd_entry,
- NULL);
+ root_objects,
+ &error_widget,
+ "dialog", &plugin->priv->dialog,
+ "main_box", &plugin->priv->main_box,
+ "use_editor",
+ &plugin->priv->use_editor_checkbutton,
+ "program_box",
+ &plugin->priv->program_box,
+ "program_cmd",
+ &plugin->priv->program_cmd_entry,
+ "line_cmd",
+ &plugin->priv->line_cmd_entry, NULL);
g_free (path);
if (!ret)
@@ -594,21 +586,21 @@ get_configuration_dialog (GtrSourceCodeViewPlugin * plugin)
//Use editor
use_editor = gconf_client_get_bool (plugin->priv->gconf_client,
- USE_EDITOR_KEY, NULL);
+ USE_EDITOR_KEY, NULL);
g_signal_connect (plugin->priv->use_editor_checkbutton, "toggled",
- G_CALLBACK (use_editor_toggled), plugin);
+ G_CALLBACK (use_editor_toggled), plugin);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
- (plugin->priv->use_editor_checkbutton),
- use_editor);
+ (plugin->priv->use_editor_checkbutton),
+ use_editor);
use_editor_toggled (GTK_TOGGLE_BUTTON
- (plugin->priv->use_editor_checkbutton), plugin);
+ (plugin->priv->use_editor_checkbutton), plugin);
//Program cmd
value = gconf_client_get_string (plugin->priv->gconf_client,
- PROGRAM_CMD_KEY, NULL);
+ PROGRAM_CMD_KEY, NULL);
gtk_entry_set_text (GTK_ENTRY (plugin->priv->program_cmd_entry), value);
@@ -616,7 +608,7 @@ get_configuration_dialog (GtrSourceCodeViewPlugin * plugin)
//Line cmd
value = gconf_client_get_string (plugin->priv->gconf_client,
- LINE_CMD_KEY, NULL);
+ LINE_CMD_KEY, NULL);
gtk_entry_set_text (GTK_ENTRY (plugin->priv->line_cmd_entry), value);
@@ -644,7 +636,7 @@ impl_activate (GtrPlugin * plugin, GtrWindow * window)
source_code_view->priv->window = window;
g_signal_connect (notebook, "page-added",
- G_CALLBACK (page_added_cb), plugin);
+ G_CALLBACK (page_added_cb), plugin);
/*
* If we already have tabs opened we have to add them
@@ -656,13 +648,13 @@ impl_activate (GtrPlugin * plugin, GtrWindow * window)
GList *msg;
page_added_cb (GTK_NOTEBOOK (notebook),
- l->data, 0, GTR_SOURCE_CODE_VIEW_PLUGIN (plugin));
+ l->data, 0, GTR_SOURCE_CODE_VIEW_PLUGIN (plugin));
po = gtr_tab_get_po (GTR_TAB (l->data));
msg = gtr_po_get_current_message (po);
showed_message_cb (GTR_TAB (l->data),
- msg->data, GTR_SOURCE_CODE_VIEW_PLUGIN (plugin));
+ msg->data, GTR_SOURCE_CODE_VIEW_PLUGIN (plugin));
}
}
@@ -683,15 +675,15 @@ impl_deactivate (GtrPlugin * plugin, GtrWindow * window)
view = gtr_context_panel_get_context_text_view (panel);
delete_text_and_tags (GTR_TAB (l->data),
- GTR_SOURCE_CODE_VIEW_PLUGIN (plugin));
+ GTR_SOURCE_CODE_VIEW_PLUGIN (plugin));
g_signal_handlers_disconnect_by_func (l->data,
- showed_message_cb, plugin);
+ showed_message_cb, plugin);
g_signal_handlers_disconnect_by_func (view, event_after, window);
g_signal_handlers_disconnect_by_func (view, motion_notify_event, NULL);
g_signal_handlers_disconnect_by_func (view,
- visibility_notify_event, NULL);
+ visibility_notify_event, NULL);
}
g_signal_handlers_disconnect_by_func (notebook, page_added_cb, plugin);
@@ -707,51 +699,50 @@ ok_button_pressed (GtrSourceCodeViewPlugin * plugin)
/* We have to get the text from the entries */
use_editor =
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
- (plugin->priv->use_editor_checkbutton));
+ (plugin->priv->use_editor_checkbutton));
program_cmd =
gtk_entry_get_text (GTK_ENTRY (plugin->priv->program_cmd_entry));
line_cmd = gtk_entry_get_text (GTK_ENTRY (plugin->priv->line_cmd_entry));
/* Now we store the data in gconf */
if (!gconf_client_key_is_writable (plugin->priv->gconf_client,
- USE_EDITOR_KEY, NULL))
+ USE_EDITOR_KEY, NULL))
return;
gconf_client_set_bool (plugin->priv->gconf_client,
- USE_EDITOR_KEY, use_editor, NULL);
+ USE_EDITOR_KEY, use_editor, NULL);
if (!gconf_client_key_is_writable (plugin->priv->gconf_client,
- PROGRAM_CMD_KEY, NULL))
+ PROGRAM_CMD_KEY, NULL))
return;
gconf_client_set_string (plugin->priv->gconf_client,
- PROGRAM_CMD_KEY, program_cmd, NULL);
+ PROGRAM_CMD_KEY, program_cmd, NULL);
if (!gconf_client_key_is_writable (plugin->priv->gconf_client,
- LINE_CMD_KEY, NULL))
+ LINE_CMD_KEY, NULL))
return;
gconf_client_set_string (plugin->priv->gconf_client,
- LINE_CMD_KEY, line_cmd, NULL);
+ LINE_CMD_KEY, line_cmd, NULL);
}
static void
configure_dialog_response_cb (GtkWidget * widget,
- gint response,
- GtrSourceCodeViewPlugin * plugin)
+ gint response, GtrSourceCodeViewPlugin * plugin)
{
switch (response)
{
case GTK_RESPONSE_OK:
{
- ok_button_pressed (plugin);
+ ok_button_pressed (plugin);
- gtk_widget_destroy (plugin->priv->dialog);
- break;
+ gtk_widget_destroy (plugin->priv->dialog);
+ break;
}
case GTK_RESPONSE_CANCEL:
{
- gtk_widget_destroy (plugin->priv->dialog);
+ gtk_widget_destroy (plugin->priv->dialog);
}
}
}
@@ -764,17 +755,17 @@ impl_create_configure_dialog (GtrPlugin * plugin)
dialog = get_configuration_dialog (GTR_SOURCE_CODE_VIEW_PLUGIN (plugin));
g_signal_connect (dialog,
- "response",
- G_CALLBACK (configure_dialog_response_cb),
- GTR_SOURCE_CODE_VIEW_PLUGIN (plugin));
+ "response",
+ G_CALLBACK (configure_dialog_response_cb),
+ GTR_SOURCE_CODE_VIEW_PLUGIN (plugin));
g_signal_connect (dialog,
- "destroy", G_CALLBACK (gtk_widget_destroy), &dialog);
+ "destroy", G_CALLBACK (gtk_widget_destroy), &dialog);
return dialog;
}
static void
-gtr_source_code_view_plugin_class_init
+ gtr_source_code_view_plugin_class_init
(GtrSourceCodeViewPluginClass * klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
@@ -787,5 +778,5 @@ gtr_source_code_view_plugin_class_init
plugin_class->create_configure_dialog = impl_create_configure_dialog;
g_type_class_add_private (object_class,
- sizeof (GtrSourceCodeViewPluginPrivate));
+ sizeof (GtrSourceCodeViewPluginPrivate));
}
diff --git a/plugins/source-code-view/gtr-source-code-view-plugin.h b/plugins/source-code-view/gtr-source-code-view-plugin.h
index 1980700..7c725cd 100644
--- a/plugins/source-code-view/gtr-source-code-view-plugin.h
+++ b/plugins/source-code-view/gtr-source-code-view-plugin.h
@@ -35,14 +35,12 @@ G_BEGIN_DECLS
#define GTR_IS_SOURCE_CODE_VIEW_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_SOURCE_CODE_VIEW_PLUGIN))
#define GTR_SOURCE_CODE_VIEW_PLUGIN_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_SOURCE_CODE_VIEW_PLUGIN_PLUGIN, GtrSourceCodeViewPluginClass))
/* Private structure type */
-typedef struct _GtrSourceCodeViewPluginPrivate
- GtrSourceCodeViewPluginPrivate;
+typedef struct _GtrSourceCodeViewPluginPrivate GtrSourceCodeViewPluginPrivate;
/*
* Main object structure
*/
-typedef struct _GtrSourceCodeViewPlugin
- GtrSourceCodeViewPlugin;
+typedef struct _GtrSourceCodeViewPlugin GtrSourceCodeViewPlugin;
struct _GtrSourceCodeViewPlugin
{
@@ -55,8 +53,7 @@ struct _GtrSourceCodeViewPlugin
/*
* Class definition
*/
-typedef struct _GtrSourceCodeViewPluginClass
- GtrSourceCodeViewPluginClass;
+typedef struct _GtrSourceCodeViewPluginClass GtrSourceCodeViewPluginClass;
struct _GtrSourceCodeViewPluginClass
{
diff --git a/plugins/source-code-view/gtr-viewer.c b/plugins/source-code-view/gtr-viewer.c
index 2c94c72..adc1f9d 100644
--- a/plugins/source-code-view/gtr-viewer.c
+++ b/plugins/source-code-view/gtr-viewer.c
@@ -71,7 +71,7 @@ gtr_viewer_init (GtrViewer * dlg)
dlg->priv = GTR_VIEWER_GET_PRIVATE (dlg);
gtk_dialog_add_buttons (GTK_DIALOG (dlg),
- GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL);
+ GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL);
gtk_window_set_title (GTK_WINDOW (dlg), _("Source Viewer"));
gtk_window_set_default_size (GTK_WINDOW (dlg), 800, 600);
@@ -81,36 +81,36 @@ gtr_viewer_init (GtrViewer * dlg)
/* HIG defaults */
gtk_container_set_border_width (GTK_CONTAINER (dlg), 5);
- gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dlg)->vbox), 2); /* 2 * 5 + 2 = 12 */
+ gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dlg)->vbox), 2); /* 2 * 5 + 2 = 12 */
gtk_container_set_border_width (GTK_CONTAINER
- (GTK_DIALOG (dlg)->action_area), 5);
+ (GTK_DIALOG (dlg)->action_area), 5);
gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dlg)->action_area), 4);
g_signal_connect (dlg,
- "response", G_CALLBACK (dialog_response_handler), NULL);
+ "response", G_CALLBACK (dialog_response_handler), NULL);
/*Builder */
path = gtr_dirs_get_ui_file ("gtr-viewer.ui");
ret = gtr_utils_get_ui_objects (path,
- root_objects,
- &error_widget,
- "main_box", &dlg->priv->main_box,
- "scrolledwindow", &sw,
- "filename_label",
- &dlg->priv->filename_label, NULL);
+ root_objects,
+ &error_widget,
+ "main_box", &dlg->priv->main_box,
+ "scrolledwindow", &sw,
+ "filename_label",
+ &dlg->priv->filename_label, NULL);
g_free (path);
if (!ret)
{
gtk_widget_show (error_widget);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox),
- error_widget, TRUE, TRUE, 0);
+ error_widget, TRUE, TRUE, 0);
return;
}
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox),
- dlg->priv->main_box, TRUE, TRUE, 0);
+ dlg->priv->main_box, TRUE, TRUE, 0);
gtk_container_set_border_width (GTK_CONTAINER (dlg->priv->main_box), 5);
@@ -121,13 +121,13 @@ gtr_viewer_init (GtrViewer * dlg)
gtk_container_add (GTK_CONTAINER (sw), dlg->priv->view);
gtk_source_view_set_highlight_current_line (GTK_SOURCE_VIEW
- (dlg->priv->view), TRUE);
+ (dlg->priv->view), TRUE);
gtk_source_view_set_show_line_numbers (GTK_SOURCE_VIEW (dlg->priv->view),
- TRUE);
+ TRUE);
gtk_source_view_set_show_right_margin (GTK_SOURCE_VIEW (dlg->priv->view),
- TRUE);
+ TRUE);
}
static void
@@ -160,9 +160,9 @@ error_dialog (GtkWindow * parent, const gchar * msg, ...)
va_end (ap);
dialog = gtk_message_dialog_new (parent,
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_OK, "%s", tmp);
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_OK, "%s", tmp);
g_free (tmp);
gtk_dialog_run (GTK_DIALOG (dialog));
@@ -171,7 +171,7 @@ error_dialog (GtkWindow * parent, const gchar * msg, ...)
static gboolean
gtk_source_buffer_load_file (GtkSourceBuffer * source_buffer,
- const gchar * filename, GError ** error)
+ const gchar * filename, GError ** error)
{
GtkTextIter iter;
gchar *buffer;
@@ -200,10 +200,10 @@ gtk_source_buffer_load_file (GtkSourceBuffer * source_buffer,
GtkTextIter start, end;
char *text;
gtk_text_buffer_get_bounds (GTK_TEXT_BUFFER (source_buffer), &start,
- &end);
+ &end);
text =
gtk_text_buffer_get_text (GTK_TEXT_BUFFER (source_buffer), &start, &end,
- TRUE);
+ TRUE);
g_assert (!strcmp (text, buffer));
g_free (text);
}
@@ -248,18 +248,18 @@ get_language_for_filename (const gchar * filename)
globs = gtk_source_language_get_globs (lang);
if (globs == NULL)
- continue;
+ continue;
for (p = globs; *p != NULL; p++)
- {
- if (g_pattern_match_simple (*p, filename_utf8))
- {
- g_strfreev (globs);
- g_free (filename_utf8);
+ {
+ if (g_pattern_match_simple (*p, filename_utf8))
+ {
+ g_strfreev (globs);
+ g_free (filename_utf8);
- return lang;
- }
- }
+ return lang;
+ }
+ }
g_strfreev (globs);
}
@@ -312,7 +312,7 @@ get_language (GtkTextBuffer * buffer, const gchar * filename)
tokens = g_strsplit_set (lang_string, " \t\n", 2);
if (tokens != NULL && tokens[0] != NULL)
- language = get_language_by_id (tokens[0]);
+ language = get_language_by_id (tokens[0]);
g_strfreev (tokens);
}
@@ -351,8 +351,8 @@ open_file (GtkSourceBuffer * buffer, const gchar * filename)
gtk_source_buffer_set_language (buffer, language);
g_object_set_data_full (G_OBJECT (buffer),
- "filename", g_strdup (filename),
- (GDestroyNotify) g_free);
+ "filename", g_strdup (filename),
+ (GDestroyNotify) g_free);
if (language != NULL)
{
@@ -361,29 +361,29 @@ open_file (GtkSourceBuffer * buffer, const gchar * filename)
styles = gtk_source_language_get_style_ids (language);
if (styles == NULL)
- g_print ("No styles in language '%s'\n",
- gtk_source_language_get_name (language));
+ g_print ("No styles in language '%s'\n",
+ gtk_source_language_get_name (language));
else
- {
- gchar **ids;
- g_print ("Styles in in language '%s':\n",
- gtk_source_language_get_name (language));
+ {
+ gchar **ids;
+ g_print ("Styles in in language '%s':\n",
+ gtk_source_language_get_name (language));
- ids = styles;
+ ids = styles;
- while (*ids != NULL)
- {
- const gchar *name;
+ while (*ids != NULL)
+ {
+ const gchar *name;
- name = gtk_source_language_get_style_name (language, *ids);
+ name = gtk_source_language_get_style_name (language, *ids);
- g_print ("- %s (name: '%s')\n", *ids, name);
+ g_print ("- %s (name: '%s')\n", *ids, name);
- ++ids;
- }
+ ++ids;
+ }
- g_strfreev (styles);
- }
+ g_strfreev (styles);
+ }
g_print ("\n");
}
@@ -411,13 +411,12 @@ jump_to_line (GtkTextView * view, gint line)
gtk_text_buffer_place_cursor (buffer, &iter);
gtk_text_view_scroll_to_mark (view,
- gtk_text_buffer_get_insert (buffer),
- 0.25, FALSE, 0.0, 0.0);
+ gtk_text_buffer_get_insert (buffer),
+ 0.25, FALSE, 0.0, 0.0);
}
void
-gtr_show_viewer (GtrWindow * window,
- const gchar * path, gint line)
+gtr_show_viewer (GtrWindow * window, const gchar * path, gint line)
{
static GtrViewer *dlg = NULL;
@@ -431,8 +430,8 @@ gtr_show_viewer (GtrWindow * window,
dlg = g_object_new (GTR_TYPE_VIEWER, NULL);
buffer =
- GTK_SOURCE_BUFFER (gtk_text_view_get_buffer
- (GTK_TEXT_VIEW (dlg->priv->view)));
+ GTK_SOURCE_BUFFER (gtk_text_view_get_buffer
+ (GTK_TEXT_VIEW (dlg->priv->view)));
open_file (buffer, path);
jump_to_line (GTK_TEXT_VIEW (dlg->priv->view), line);
@@ -442,7 +441,7 @@ gtr_show_viewer (GtrWindow * window,
g_free (label);
g_signal_connect (dlg,
- "destroy", G_CALLBACK (gtk_widget_destroyed), &dlg);
+ "destroy", G_CALLBACK (gtk_widget_destroyed), &dlg);
gtk_widget_show (GTK_WIDGET (dlg));
}
diff --git a/plugins/source-code-view/gtr-viewer.h b/plugins/source-code-view/gtr-viewer.h
index b296467..85e4ac9 100644
--- a/plugins/source-code-view/gtr-viewer.h
+++ b/plugins/source-code-view/gtr-viewer.h
@@ -70,8 +70,7 @@ gtr_viewer_get_type (void)
GType gtr_viewer_register_type (GTypeModule * module);
- void gtr_show_viewer (GtrWindow * window,
- const gchar * path, gint line);
+ void gtr_show_viewer (GtrWindow * window, const gchar * path, gint line);
G_END_DECLS
#endif /* __VIEWER_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
