Switch structs from Gtranslator to Gtr

parent f04f1a7b
......@@ -39,11 +39,11 @@
#define GTR_ALTERNATE_LANG_PANEL_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ( \
(object), \
GTR_TYPE_ALTERNATE_LANG_PANEL, \
GtranslatorAlternateLangPanelPrivate))
GtrAlternateLangPanelPrivate))
GTR_PLUGIN_DEFINE_TYPE (GtranslatorAlternateLangPanel,
GTR_PLUGIN_DEFINE_TYPE (GtrAlternateLangPanel,
gtranslator_alternate_lang_panel, GTK_TYPE_VBOX)
struct _GtranslatorAlternateLangPanelPrivate
struct _GtrAlternateLangPanelPrivate
{
GtkWidget *open_button;
GtkWidget *close_button;
......@@ -51,14 +51,14 @@ GTR_PLUGIN_DEFINE_TYPE (GtranslatorAlternateLangPanel,
GtkWidget *status;
GtranslatorPo *po;
GtranslatorMsg *first;
GtranslatorTab *tab;
GtrPo *po;
GtrMsg *first;
GtrTab *tab;
};
static void
gtranslator_alternate_lang_panel_set_text
(GtranslatorAlternateLangPanel * panel, const gchar * text)
(GtrAlternateLangPanel * panel, const gchar * text)
{
GtkTextBuffer *buf;
......@@ -68,7 +68,7 @@ GTR_PLUGIN_DEFINE_TYPE (GtranslatorAlternateLangPanel,
}
static void
search_message (GtranslatorAlternateLangPanel * panel, GtranslatorMsg * msg)
search_message (GtrAlternateLangPanel * panel, GtrMsg * msg)
{
GList *messages;
GList *l;
......@@ -76,7 +76,7 @@ search_message (GtranslatorAlternateLangPanel * panel, GtranslatorMsg * msg)
gchar *msgid_collate;
const gchar *string;
gchar *string_collate;
GtranslatorMsgStatus status;
GtrMsgStatus status;
msgid_collate = g_utf8_collate_key (msgid, -1);
messages = gtranslator_po_get_messages (panel->priv->po);
......@@ -124,9 +124,9 @@ search_message (GtranslatorAlternateLangPanel * panel, GtranslatorMsg * msg)
}
static void
showed_message_cb (GtranslatorTab * tab,
GtranslatorMsg * msg,
GtranslatorAlternateLangPanel * panel)
showed_message_cb (GtrTab * tab,
GtrMsg * msg,
GtrAlternateLangPanel * panel)
{
if (panel->priv->po == NULL)
{
......@@ -137,7 +137,7 @@ showed_message_cb (GtranslatorTab * tab,
}
static void
open_file (GtkWidget * dialog, GtranslatorAlternateLangPanel * panel)
open_file (GtkWidget * dialog, GtrAlternateLangPanel * panel)
{
GError *error = NULL;
GFile *file;
......@@ -176,7 +176,7 @@ open_file (GtkWidget * dialog, GtranslatorAlternateLangPanel * panel)
static void
gtranslator_file_chooser_analyse (gpointer dialog,
GtranslatorAlternateLangPanel * panel)
GtrAlternateLangPanel * panel)
{
gint reply;
......@@ -199,11 +199,11 @@ gtranslator_file_chooser_analyse (gpointer dialog,
static void
open_button_clicked_cb (GtkWidget * open_button,
GtranslatorAlternateLangPanel * panel)
GtrAlternateLangPanel * panel)
{
GtkWidget *dialog = NULL;
gchar *dir;
GtranslatorPo *tab_po;
GtrPo *tab_po;
GFile *location, *parent;
if (dialog != NULL)
......@@ -239,7 +239,7 @@ open_button_clicked_cb (GtkWidget * open_button,
static void
close_button_clicked_cb (GtkWidget * close_button,
GtranslatorAlternateLangPanel * panel)
GtrAlternateLangPanel * panel)
{
if (panel->priv->po != NULL)
{
......@@ -254,7 +254,7 @@ close_button_clicked_cb (GtkWidget * close_button,
}
static void
gtranslator_alternate_lang_panel_draw (GtranslatorAlternateLangPanel * panel)
gtranslator_alternate_lang_panel_draw (GtrAlternateLangPanel * panel)
{
GtkWidget *hbox;
GtkWidget *buttonbox;
......@@ -327,7 +327,7 @@ gtranslator_alternate_lang_panel_draw (GtranslatorAlternateLangPanel * panel)
}
static void
gtranslator_alternate_lang_panel_init (GtranslatorAlternateLangPanel * panel)
gtranslator_alternate_lang_panel_init (GtrAlternateLangPanel * panel)
{
panel->priv = GTR_ALTERNATE_LANG_PANEL_GET_PRIVATE (panel);
......@@ -345,12 +345,12 @@ gtranslator_alternate_lang_panel_finalize (GObject * object)
static void
gtranslator_alternate_lang_panel_class_init
(GtranslatorAlternateLangPanelClass * klass)
(GtrAlternateLangPanelClass * klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
g_type_class_add_private (klass,
sizeof (GtranslatorAlternateLangPanelPrivate));
sizeof (GtrAlternateLangPanelPrivate));
object_class->finalize = gtranslator_alternate_lang_panel_finalize;
}
......@@ -360,7 +360,7 @@ gtranslator_alternate_lang_panel_class_init
GtkWidget *
gtranslator_alternate_lang_panel_new (GtkWidget * tab)
{
GtranslatorAlternateLangPanel *panel;
GtrAlternateLangPanel *panel;
panel = g_object_new (GTR_TYPE_ALTERNATE_LANG_PANEL, NULL);
panel->priv->tab = GTR_TAB (tab);
......
......@@ -27,35 +27,35 @@ G_BEGIN_DECLS
* Type checking and casting macros
*/
#define GTR_TYPE_ALTERNATE_LANG_PANEL (gtranslator_alternate_lang_panel_get_type ())
#define GTR_ALTERNATE_LANG_PANEL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_ALTERNATE_LANG_PANEL, GtranslatorAlternateLangPanel))
#define GTR_ALTERNATE_LANG_PANEL_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_ALTERNATE_LANG_PANEL, GtranslatorAlternateLangPanelClass))
#define GTR_ALTERNATE_LANG_PANEL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_ALTERNATE_LANG_PANEL, GtrAlternateLangPanel))
#define GTR_ALTERNATE_LANG_PANEL_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_ALTERNATE_LANG_PANEL, GtrAlternateLangPanelClass))
#define GTR_IS_ALTERNATE_LANG_PANEL(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_ALTERNATE_LANG_PANEL))
#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, GtranslatorAlternateLangPanelClass))
#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 _GtranslatorAlternateLangPanelPrivate
GtranslatorAlternateLangPanelPrivate;
typedef struct _GtrAlternateLangPanelPrivate
GtrAlternateLangPanelPrivate;
/*
* Main object structure
*/
typedef struct _GtranslatorAlternateLangPanel GtranslatorAlternateLangPanel;
typedef struct _GtrAlternateLangPanel GtrAlternateLangPanel;
struct _GtranslatorAlternateLangPanel
struct _GtrAlternateLangPanel
{
GtkVBox parent_instance;
/*< private > */
GtranslatorAlternateLangPanelPrivate *priv;
GtrAlternateLangPanelPrivate *priv;
};
/*
* Class definition
*/
typedef struct _GtranslatorAlternateLangPanelClass
GtranslatorAlternateLangPanelClass;
typedef struct _GtrAlternateLangPanelClass
GtrAlternateLangPanelClass;
struct _GtranslatorAlternateLangPanelClass
struct _GtrAlternateLangPanelClass
{
GtkVBoxClass parent_class;
};
......
......@@ -27,23 +27,23 @@
#include <glib/gi18n-lib.h>
#define WINDOW_DATA_KEY "GtranslatorAlternateLangPluginWindowData"
#define TAB_DATA_KEY "GtranslatorAlternateLangPluginTabData"
#define WINDOW_DATA_KEY "GtrAlternateLangPluginWindowData"
#define TAB_DATA_KEY "GtrAlternateLangPluginTabData"
#define MENU_PATH "/MainMenu/ViewMenu/ViewOps_2"
#define GTR_MESSAGE_TABLE_GET_PRIVATE(object) \
(G_TYPE_INSTANCE_GET_PRIVATE ((object), \
GTR_TYPE_MESSAGE_TABLE, \
GtranslatorAlternateLangPluginPrivate))
GtrAlternateLangPluginPrivate))
GTR_PLUGIN_REGISTER_TYPE_WITH_CODE (GtranslatorAlternateLangPlugin,
GTR_PLUGIN_REGISTER_TYPE_WITH_CODE (GtrAlternateLangPlugin,
gtranslator_alternate_lang_plugin,
gtranslator_alternate_lang_panel_register_type
(module);)
static void on_alternate_lang_activated (GtkAction * action,
GtranslatorWindow * window)
GtrWindow * window)
{
GtranslatorTab *tab;
GtrTab *tab;
GtkWidget *alternatelang;
tab = gtranslator_window_get_active_tab (window);
......@@ -73,9 +73,9 @@ free_window_data (WindowData * data)
}
static void
update_ui_real (GtranslatorWindow * window, WindowData * data)
update_ui_real (GtrWindow * window, WindowData * data)
{
GtranslatorTab *tab;
GtrTab *tab;
GtkAction *action;
tab = gtranslator_window_get_active_tab (window);
......@@ -85,7 +85,7 @@ update_ui_real (GtranslatorWindow * window, WindowData * data)
}
static void
gtranslator_alternate_lang_plugin_init (GtranslatorAlternateLangPlugin *
gtranslator_alternate_lang_plugin_init (GtrAlternateLangPlugin *
message_table)
{
}
......@@ -102,10 +102,10 @@ static void
create_alternate_lang_plugin_panel (GtkNotebook * notebook,
GtkWidget * child,
guint page_num,
GtranslatorWindow * window)
GtrWindow * window)
{
GtkWidget *alternatelang;
GtranslatorPo *po;
GtrPo *po;
po = gtranslator_tab_get_po (GTR_TAB (child));
......@@ -122,9 +122,9 @@ create_alternate_lang_plugin_panel (GtkNotebook * notebook,
}
static void
impl_activate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
impl_activate (GtrPlugin * plugin, GtrWindow * window)
{
GtranslatorNotebook *notebook;
GtrNotebook *notebook;
GList *tabs = NULL;
GtkUIManager *manager;
WindowData *data;
......@@ -134,7 +134,7 @@ impl_activate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
manager = gtranslator_window_get_ui_manager (window);
data->action_group =
gtk_action_group_new ("GtranslatorAlternateLangPluginActions");
gtk_action_group_new ("GtrAlternateLangPluginActions");
gtk_action_group_set_translation_domain (data->action_group,
GETTEXT_PACKAGE);
gtk_action_group_add_actions (data->action_group, action_entries,
......@@ -173,9 +173,9 @@ impl_activate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
}
static void
impl_deactivate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
impl_deactivate (GtrPlugin * plugin, GtrWindow * window)
{
GtranslatorNotebook *notebook;
GtrNotebook *notebook;
GtkWidget *alternatelang;
GList *tabs;
GtkUIManager *manager;
......@@ -217,7 +217,7 @@ impl_deactivate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
}
static void
impl_update_ui (GtranslatorPlugin * plugin, GtranslatorWindow * window)
impl_update_ui (GtrPlugin * plugin, GtrWindow * window)
{
WindowData *data;
......@@ -230,10 +230,10 @@ impl_update_ui (GtranslatorPlugin * plugin, GtranslatorWindow * window)
static void
gtranslator_alternate_lang_plugin_class_init
(GtranslatorAlternateLangPluginClass * klass)
(GtrAlternateLangPluginClass * klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GtranslatorPluginClass *plugin_class = GTR_PLUGIN_CLASS (klass);
GtrPluginClass *plugin_class = GTR_PLUGIN_CLASS (klass);
object_class->finalize = gtranslator_alternate_lang_plugin_finalize;
......
......@@ -30,34 +30,34 @@ G_BEGIN_DECLS
* Type checking and casting macros
*/
#define GTR_TYPE_ALTERNATE_LANG_PLUGIN (gtranslator_alternate_lang_get_type ())
#define GTR_ALTERNATE_LANG_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_MESSAGEALTERNATE_LANG_PLUGIN, GtranslatorAlternateLangPlugin))
#define GTR_ALTERNATE_LANG_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_ALTERNATE_LANG_PLUGIN, GtranslatorAlternateLangPluginClass))
#define GTR_ALTERNATE_LANG_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_MESSAGEALTERNATE_LANG_PLUGIN, GtrAlternateLangPlugin))
#define GTR_ALTERNATE_LANG_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_ALTERNATE_LANG_PLUGIN, GtrAlternateLangPluginClass))
#define GTR_IS_ALTERNATE_LANG_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_ALTERNATE_LANG_PLUGIN))
#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, GtranslatorAlternateLangPluginClass))
#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 _GtranslatorAlternateLangPluginPrivate
GtranslatorAlternateLangPluginPrivate;
typedef struct _GtrAlternateLangPluginPrivate
GtrAlternateLangPluginPrivate;
/*
* Main object structure
*/
typedef struct _GtranslatorAlternateLangPlugin GtranslatorAlternateLangPlugin;
typedef struct _GtrAlternateLangPlugin GtrAlternateLangPlugin;
struct _GtranslatorAlternateLangPlugin
struct _GtrAlternateLangPlugin
{
GtranslatorPlugin parent_instance;
GtrPlugin parent_instance;
};
/*
* Class definition
*/
typedef struct _GtranslatorAlternateLangPluginClass
GtranslatorAlternateLangPluginClass;
typedef struct _GtrAlternateLangPluginClass
GtrAlternateLangPluginClass;
struct _GtranslatorAlternateLangPluginClass
struct _GtrAlternateLangPluginClass
{
GtranslatorPluginClass parent_class;
GtrPluginClass parent_class;
};
/*
......
......@@ -34,9 +34,9 @@
#define GTR_CHARMAP_PANEL_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ( \
(object), \
GTR_TYPE_CHARMAP_PANEL, \
GtranslatorCharmapPanelPrivate))
GtrCharmapPanelPrivate))
struct _GtranslatorCharmapPanelPrivate
struct _GtrCharmapPanelPrivate
{
#ifdef HAVE_GUCHARMAP_2
GucharmapChaptersView *chapters_view;
......@@ -47,14 +47,14 @@ struct _GtranslatorCharmapPanelPrivate
#endif
};
GTR_PLUGIN_DEFINE_TYPE (GtranslatorCharmapPanel, gtranslator_charmap_panel,
GTR_PLUGIN_DEFINE_TYPE (GtrCharmapPanel, gtranslator_charmap_panel,
GTK_TYPE_VBOX)
#ifdef HAVE_GUCHARMAP_2
static void
on_chapter_view_selection_changed (GtkTreeSelection * selection,
GtranslatorCharmapPanel * panel)
GtrCharmapPanel * panel)
{
GtranslatorCharmapPanelPrivate *priv = panel->priv;
GtrCharmapPanelPrivate *priv = panel->priv;
GucharmapCodepointList *codepoint_list;
GtkTreeIter iter;
......@@ -70,7 +70,7 @@ GTR_PLUGIN_DEFINE_TYPE (GtranslatorCharmapPanel, gtranslator_charmap_panel,
#else
static void
on_chapter_changed (GucharmapChapters * chapters,
GtranslatorCharmapPanel * panel)
GtrCharmapPanel * panel)
{
gucharmap_table_set_codepoint_list (GUCHARMAP_TABLE (panel->priv->table),
gucharmap_chapters_get_codepoint_list
......@@ -79,9 +79,9 @@ GTR_PLUGIN_DEFINE_TYPE (GtranslatorCharmapPanel, gtranslator_charmap_panel,
#endif /* HAVE_GUCHARMAP_2 */
static void
gtranslator_charmap_panel_init (GtranslatorCharmapPanel * panel)
gtranslator_charmap_panel_init (GtrCharmapPanel * panel)
{
GtranslatorCharmapPanelPrivate *priv;
GtrCharmapPanelPrivate *priv;
GtkPaned *paned;
#ifdef HAVE_GUCHARMAP_2
GtkWidget *scrolled_window, *view, *chartable;
......@@ -168,11 +168,11 @@ gtranslator_charmap_panel_finalize (GObject * object)
}
static void
gtranslator_charmap_panel_class_init (GtranslatorCharmapPanelClass * klass)
gtranslator_charmap_panel_class_init (GtrCharmapPanelClass * klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
g_type_class_add_private (klass, sizeof (GtranslatorCharmapPanelPrivate));
g_type_class_add_private (klass, sizeof (GtrCharmapPanelPrivate));
object_class->finalize = gtranslator_charmap_panel_finalize;
}
......@@ -185,13 +185,13 @@ gtranslator_charmap_panel_new (void)
#ifdef HAVE_GUCHARMAP_2
GucharmapChartable *
gtranslator_charmap_panel_get_chartable (GtranslatorCharmapPanel * panel)
gtranslator_charmap_panel_get_chartable (GtrCharmapPanel * panel)
{
return panel->priv->chartable;
}
#else
GucharmapTable *
gtranslator_charmap_panel_get_table (GtranslatorCharmapPanel * panel)
gtranslator_charmap_panel_get_table (GtrCharmapPanel * panel)
{
return GUCHARMAP_TABLE (panel->priv->table);
}
......
......@@ -38,33 +38,33 @@ G_BEGIN_DECLS
* Type checking and casting macros
*/
#define GTR_TYPE_CHARMAP_PANEL (gtranslator_charmap_panel_get_type ())
#define GTR_CHARMAP_PANEL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_CHARMAP_PANEL, GtranslatorCharmapPanel))
#define GTR_CHARMAP_PANEL_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_CHARMAP_PANEL, GtranslatorCharmapPanelClass))
#define GTR_CHARMAP_PANEL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_CHARMAP_PANEL, GtrCharmapPanel))
#define GTR_CHARMAP_PANEL_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_CHARMAP_PANEL, GtrCharmapPanelClass))
#define GTR_IS_CHARMAP_PANEL(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_CHARMAP_PANEL))
#define GTR_IS_CHARMAP_PANEL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_CHARMAP_PANEL))
#define GTR_CHARMAP_PANEL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_CHARMAP_PANEL, GtranslatorCharmapPanelClass))
#define GTR_CHARMAP_PANEL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_CHARMAP_PANEL, GtrCharmapPanelClass))
/* Private structure type */
typedef struct _GtranslatorCharmapPanelPrivate GtranslatorCharmapPanelPrivate;
typedef struct _GtrCharmapPanelPrivate GtrCharmapPanelPrivate;
/*
* Main object structure
*/
typedef struct _GtranslatorCharmapPanel GtranslatorCharmapPanel;
typedef struct _GtrCharmapPanel GtrCharmapPanel;
struct _GtranslatorCharmapPanel
struct _GtrCharmapPanel
{
GtkVBox parent_instance;
/*< private > */
GtranslatorCharmapPanelPrivate *priv;
GtrCharmapPanelPrivate *priv;
};
/*
* Class definition
*/
typedef struct _GtranslatorCharmapPanelClass GtranslatorCharmapPanelClass;
typedef struct _GtrCharmapPanelClass GtrCharmapPanelClass;
struct _GtranslatorCharmapPanelClass
struct _GtrCharmapPanelClass
{
GtkVBoxClass parent_class;
};
......@@ -80,11 +80,11 @@ gtranslator_charmap_panel_get_type (void)
#ifdef HAVE_GUCHARMAP_2
GucharmapChartable
*gtranslator_charmap_panel_get_chartable (GtranslatorCharmapPanel *
*gtranslator_charmap_panel_get_chartable (GtrCharmapPanel *
panel);
#else
GucharmapTable
*gtranslator_charmap_panel_get_table (GtranslatorCharmapPanel * panel);
*gtranslator_charmap_panel_get_table (GtrCharmapPanel * panel);
#endif
G_END_DECLS
......
......@@ -38,12 +38,12 @@
#include <gucharmap/gucharmap-unicode-info.h>
#endif
#define WINDOW_DATA_KEY "GtranslatorCharmapPluginWindowData"
#define WINDOW_DATA_KEY "GtrCharmapPluginWindowData"
#define GTR_CHARMAP_PLUGIN_GET_PRIVATE(object) \
(G_TYPE_INSTANCE_GET_PRIVATE ((object), \
GTR_TYPE_CHARMAP_PLUGIN, \
GtranslatorCharmapPluginPrivate))
GtrCharmapPluginPrivate))
typedef struct
{
......@@ -51,20 +51,20 @@ typedef struct
guint context_id;
} WindowData;
GTR_PLUGIN_REGISTER_TYPE_WITH_CODE (GtranslatorCharmapPlugin,
GTR_PLUGIN_REGISTER_TYPE_WITH_CODE (GtrCharmapPlugin,
gtranslator_charmap_plugin,
gtranslator_charmap_panel_register_type
(module);)
static void gtranslator_charmap_plugin_init (GtranslatorCharmapPlugin *
static void gtranslator_charmap_plugin_init (GtrCharmapPlugin *
plugin)
{
//gtranslator_debug_message (DEBUG_PLUGINS, "GtranslatorCharmapPlugin initializing");
//gtranslator_debug_message (DEBUG_PLUGINS, "GtrCharmapPlugin initializing");
}
static void
gtranslator_charmap_plugin_finalize (GObject * object)
{
//gtranslator_debug_message (DEBUG_PLUGINS, "GtranslatorCharmapPlugin finalizing");
//gtranslator_debug_message (DEBUG_PLUGINS, "GtrCharmapPlugin finalizing");
G_OBJECT_CLASS (gtranslator_charmap_plugin_parent_class)->finalize (object);
}
......@@ -81,9 +81,9 @@ static void
#else
on_table_status_message (GucharmapTable * chartable,
#endif
const gchar * message, GtranslatorWindow * window)
const gchar * message, GtrWindow * window)
{
GtranslatorStatusbar *statusbar;
GtrStatusbar *statusbar;
WindowData *data;
statusbar = GTR_STATUSBAR (gtranslator_window_get_statusbar (window));
......@@ -100,10 +100,10 @@ on_table_status_message (GucharmapTable * chartable,
static void
#ifdef HAVE_GUCHARMAP_2
on_table_sync_active_char (GucharmapChartable * chartable,
GParamSpec * psepc, GtranslatorWindow * window)
GParamSpec * psepc, GtrWindow * window)
#else
on_table_set_active_char (GucharmapTable * chartable,
gunichar wc, GtranslatorWindow * window)
gunichar wc, GtrWindow * window)
#endif
{
GString *gs;
......@@ -143,7 +143,7 @@ on_table_set_active_char (GucharmapTable * chartable,
static gboolean
on_table_focus_out_event (GtkWidget * drawing_area,
GdkEventFocus * event, GtranslatorWindow * window)
GdkEventFocus * event, GtrWindow * window)
{
#ifdef HAVE_GUCHARMAP_2
GucharmapChartable *chartable;
......@@ -170,11 +170,11 @@ on_table_focus_out_event (GtkWidget * drawing_area,
#ifdef HAVE_GUCHARMAP_2
static void
on_table_activate (GucharmapChartable * chartable, GtranslatorWindow * window)
on_table_activate (GucharmapChartable * chartable, GtrWindow * window)
#else
static void
on_table_activate (GucharmapTable * chartable,
gunichar wc, GtranslatorWindow * window)
gunichar wc, GtrWindow * window)
#endif
{
GtkTextView *view;
......@@ -213,7 +213,7 @@ on_table_activate (GucharmapTable * chartable,
}
static GtkWidget *
create_charmap_panel (GtranslatorWindow * window)
create_charmap_panel (GtrWindow * window)
{
GtkWidget *panel;
#ifdef HAVE_GUCHARMAP_2
......@@ -265,9 +265,9 @@ create_charmap_panel (GtranslatorWindow * window)
}
static void
impl_activate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
impl_activate (GtrPlugin * plugin, GtrWindow * window)
{
GtranslatorStatusbar *statusbar;
GtrStatusbar *statusbar;
WindowData *data;
data = g_new (WindowData, 1);
......@@ -279,7 +279,7 @@ impl_activate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
gtranslator_window_add_widget (window,
data->panel,
"GtranslatorCharmapPlugin",
"GtrCharmapPlugin",
_("Character Map"),
"charmap-plugin-icon",
GTR_WINDOW_PLACEMENT_LEFT);
......@@ -294,7 +294,7 @@ impl_activate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
}
static void
impl_deactivate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
impl_deactivate (GtrPlugin * plugin, GtrWindow * window)
{
WindowData *data;
#ifdef HAVE_GUCHARMAP_2
......@@ -323,10 +323,10 @@ impl_deactivate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
}
static void
gtranslator_charmap_plugin_class_init (GtranslatorCharmapPluginClass * klass)
gtranslator_charmap_plugin_class_init (GtrCharmapPluginClass * klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GtranslatorPluginClass *plugin_class = GTR_PLUGIN_CLASS (klass);
GtrPluginClass *plugin_class = GTR_PLUGIN_CLASS (klass);
object_class->finalize = gtranslator_charmap_plugin_finalize;
......
......@@ -32,33 +32,33 @@ G_BEGIN_DECLS
* Type checking and casting macros
*/
#define GTR_TYPE_CHARMAP_PLUGIN (gtranslator_charmap_plugin_get_type ())
#define GTR_CHARMAP_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_CHARMAP_PLUGIN, GtranslatorCharmapPlugin))
#define GTR_CHARMAP_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_CHARMAP_PLUGIN, GtranslatorCharmapPluginClass))
#define GTR_CHARMAP_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_CHARMAP_PLUGIN, GtrCharmapPlugin))
#define GTR_CHARMAP_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_CHARMAP_PLUGIN, GtrCharmapPluginClass))
#define GTR_IS_CHARMAP_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_CHARMAP_PLUGIN))
#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, GtranslatorCharmapPluginClass))
#define GTR_CHARMAP_PLUGIN_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_CHARMAP_PLUGIN, GtrCharmapPluginClass))
/* Private structure type */
typedef struct _GtranslatorCharmapPluginPrivate
GtranslatorCharmapPluginPrivate;
typedef struct _GtrCharmapPluginPrivate
GtrCharmapPluginPrivate;
/*
* Main object structure
*/
typedef struct _GtranslatorCharmapPlugin GtranslatorCharmapPlugin;
typedef struct _GtrCharmapPlugin GtrCharmapPlugin;
struct _GtranslatorCharmapPlugin
struct _GtrCharmapPlugin
{
GtranslatorPlugin parent_instance;
GtrPlugin parent_instance;
};
/*
* Class definition
*/
typedef struct _GtranslatorCharmapPluginClass GtranslatorCharmapPluginClass;
typedef struct _GtrCharmapPluginClass GtrCharmapPluginClass;
struct _GtranslatorCharmapPluginClass
struct _GtrCharmapPluginClass
{
GtranslatorPluginClass parent_class;
GtrPluginClass parent_class;
};
/*
......
......@@ -37,7 +37,7 @@
#define GTR_DICT_PANEL_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ( \
(object), \
GTR_TYPE_DICT_PANEL, \
GtranslatorDictPanelPrivate))
GtrDictPanelPrivate))
#define DICTIONARY_GCONF_DIR "/apps/gtranslator/plugins/dictionary"
#define DICTIONARY_GCONF_DATABASE_KEY DICTIONARY_GCONF_DIR "/database"
......@@ -52,12 +52,12 @@
#define GDICT_SIDEBAR_STRATEGIES_PAGE "strat-chooser"
#define GDICT_SIDEBAR_SOURCES_PAGE "source-chooser"
GTR_PLUGIN_DEFINE_TYPE (GtranslatorDictPanel, gtranslator_dict_panel,
GTR_PLUGIN_DEFINE_TYPE (GtrDictPanel, gtranslator_dict_panel,
GTK_TYPE_VBOX)
struct _GtranslatorDictPanelPrivate
struct _GtrDictPanelPrivate
{
GtkPaned *paned;
GtranslatorStatusbar *status;