alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* mug: fix header clearing + code reindentation

Browse Source
This commit is contained in:
Dirk-Jan C. Binnema
2010-11-27 13:31:26 +02:00
parent 2fabf5b564
commit ac1b942dd8
9 changed files with 664 additions and 756 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
toys/mug/mug-shortcuts.c
View File

@ -23,9 +23,9 @@
/* include other impl specific header files */
/* 'private'/'protected' functions */
static void mug_shortcuts_class_init (MugShortcutsClass *klass);
static void mug_shortcuts_init (MugShortcuts *obj);
static void mug_shortcuts_finalize (GObject *obj);
static void mug_shortcuts_class_init(MugShortcutsClass * klass);
static void mug_shortcuts_init(MugShortcuts * obj);
static void mug_shortcuts_finalize(GObject * obj);
#define MUG_SHORTCUT_BOOKMARK "bookmark"
@ -39,7 +39,7 @@ enum {
struct _MugShortcutsPrivate {
GtkWidget *_bbox;
};
#define MUG_SHORTCUTS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
MUG_TYPE_SHORTCUTS, \
@ -47,109 +47,99 @@ struct _MugShortcutsPrivate {
/* globals */
static GtkVBoxClass *parent_class = NULL;
static guint signals[LAST_SIGNAL] = {0};
static guint signals[LAST_SIGNAL] = { 0 };
G_DEFINE_TYPE (MugShortcuts, mug_shortcuts, GTK_TYPE_VBOX);
G_DEFINE_TYPE(MugShortcuts, mug_shortcuts, GTK_TYPE_VBOX);
static void
mug_shortcuts_class_init (MugShortcutsClass *klass)
static void mug_shortcuts_class_init(MugShortcutsClass * klass)
{
GObjectClass *gobject_class;
gobject_class = (GObjectClass*) klass;
gobject_class = (GObjectClass *) klass;
parent_class = g_type_class_peek_parent (klass);
parent_class = g_type_class_peek_parent(klass);
gobject_class->finalize = mug_shortcuts_finalize;
g_type_class_add_private (gobject_class, sizeof(MugShortcutsPrivate));
g_type_class_add_private(gobject_class, sizeof(MugShortcutsPrivate));
/* signal definitions go here, e.g.: */
signals[SHORTCUT_CLICKED] =
g_signal_new ("clicked",
G_TYPE_FROM_CLASS(gobject_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET(MugShortcutsClass, clicked),
NULL, NULL,
g_cclosure_marshal_VOID__STRING,
G_TYPE_NONE, 1, G_TYPE_STRING);
g_signal_new("clicked",
G_TYPE_FROM_CLASS(gobject_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET(MugShortcutsClass, clicked),
NULL, NULL,
g_cclosure_marshal_VOID__STRING,
G_TYPE_NONE, 1, G_TYPE_STRING);
/* signals[MY_SIGNAL_2] = */
/* g_signal_new ("my_signal_2",....); */
/* etc. */
}
static void
mug_shortcuts_init (MugShortcuts *obj)
static void mug_shortcuts_init(MugShortcuts * obj)
{
obj->_priv = MUG_SHORTCUTS_GET_PRIVATE(obj);
obj->_priv->_bbox = gtk_vbutton_box_new ();
gtk_button_box_set_layout (GTK_BUTTON_BOX(obj->_priv->_bbox),
GTK_BUTTONBOX_START);
gtk_box_pack_start (GTK_BOX(obj), obj->_priv->_bbox, TRUE, TRUE, 0);
obj->_priv->_bbox = gtk_vbutton_box_new();
gtk_button_box_set_layout(GTK_BUTTON_BOX(obj->_priv->_bbox),
GTK_BUTTONBOX_START);
gtk_box_pack_start(GTK_BOX(obj), obj->_priv->_bbox, TRUE, TRUE, 0);
}
static void
mug_shortcuts_finalize (GObject *obj)
static void mug_shortcuts_finalize(GObject * obj)
{
/* free/unref instance resources here */
G_OBJECT_CLASS(parent_class)->finalize (obj);
G_OBJECT_CLASS(parent_class)->finalize(obj);
}
static void
on_button_clicked (GtkWidget *button, MugShortcuts *self)
static void on_button_clicked(GtkWidget * button, MugShortcuts * self)
{
g_signal_emit (G_OBJECT(self),
signals[SHORTCUT_CLICKED], 0,
(const gchar*)g_object_get_data (G_OBJECT(button),
MUG_SHORTCUT_BOOKMARK));
g_signal_emit(G_OBJECT(self),
signals[SHORTCUT_CLICKED], 0,
(const gchar *)g_object_get_data(G_OBJECT(button),
MUG_SHORTCUT_BOOKMARK));
}
static void
each_bookmark (const char* key, const char* val, MugShortcuts *self)
static void each_bookmark(const char *key, const char *val, MugShortcuts * self)
{
GtkWidget *button;
button = gtk_button_new_with_label (key);
g_object_set_data_full (G_OBJECT(button), MUG_SHORTCUT_BOOKMARK,
g_strdup(val), g_free);
g_signal_connect (G_OBJECT(button), "clicked", G_CALLBACK(on_button_clicked),
self);
gtk_container_add (GTK_CONTAINER(self->_priv->_bbox), button);
button = gtk_button_new_with_label(key);
g_object_set_data_full(G_OBJECT(button), MUG_SHORTCUT_BOOKMARK,
g_strdup(val), g_free);
g_signal_connect(G_OBJECT(button), "clicked",
G_CALLBACK(on_button_clicked), self);
gtk_container_add(GTK_CONTAINER(self->_priv->_bbox), button);
}
static gboolean
init_shortcuts (MugShortcuts *self, const char* bmpath)
static gboolean init_shortcuts(MugShortcuts * self, const char *bmpath)
{
MuBookmarks *bookmarks;
bookmarks = mu_bookmarks_new (bmpath);
bookmarks = mu_bookmarks_new(bmpath);
if (!bookmarks)
return TRUE;
mu_bookmarks_foreach (bookmarks, (MuBookmarksForeachFunc)each_bookmark,
self);
mu_bookmarks_destroy (bookmarks);
mu_bookmarks_foreach(bookmarks, (MuBookmarksForeachFunc) each_bookmark,
self);
mu_bookmarks_destroy(bookmarks);
return TRUE;
}
GtkWidget*
mug_shortcuts_new (const char *bmpath)
GtkWidget *mug_shortcuts_new(const char *bmpath)
{
MugShortcuts *self;
self = MUG_SHORTCUTS(g_object_new(MUG_TYPE_SHORTCUTS, NULL));
if (!init_shortcuts (self, bmpath)) {
g_object_unref (self);
if (!init_shortcuts(self, bmpath)) {
g_object_unref(self);
return NULL;
}
return GTK_WIDGET(self);
}
/* following: other function implementations */
/* such as mug_shortcuts_do_something, or mug_shortcuts_has_foo */