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

* mug: cleanups/indentation

Browse Source
This commit is contained in:
Dirk-Jan C. Binnema
2010-11-27 14:53:09 +02:00
parent ac1b942dd8
commit beb84bb5de
9 changed files with 584 additions and 515 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
toys/mug/mug-msg-list-view.c
View File

@ -65,7 +65,8 @@ static guint signals[LAST_SIGNAL] = { 0 };
G_DEFINE_TYPE (MugMsgListView, mug_msg_list_view, GTK_TYPE_TREE_VIEW); G_DEFINE_TYPE (MugMsgListView, mug_msg_list_view, GTK_TYPE_TREE_VIEW);
static void mug_msg_list_view_class_init(MugMsgListViewClass * klass) static void
mug_msg_list_view_class_init (MugMsgListViewClass * klass)
{ {
GObjectClass *gobject_class; GObjectClass *gobject_class;
gobject_class = (GObjectClass *) klass; gobject_class = (GObjectClass *) klass;
@ -73,7 +74,8 @@ static void mug_msg_list_view_class_init(MugMsgListViewClass * klass)
parent_class = g_type_class_peek_parent (klass); parent_class = g_type_class_peek_parent (klass);
gobject_class->finalize = mug_msg_list_view_finalize; gobject_class->finalize = mug_msg_list_view_finalize;
g_type_class_add_private(gobject_class, sizeof(MugMsgListViewPrivate)); g_type_class_add_private (gobject_class,
sizeof (MugMsgListViewPrivate));
signals[MUG_MSG_SELECTED] = signals[MUG_MSG_SELECTED] =
g_signal_new ("msg-selected", g_signal_new ("msg-selected",
@ -95,7 +97,8 @@ static void mug_msg_list_view_class_init(MugMsgListViewClass * klass)
G_TYPE_NONE, 1, G_TYPE_UINT); G_TYPE_NONE, 1, G_TYPE_UINT);
} }
static void on_cursor_changed(GtkTreeView * tview, MugMsgListView * lst) static void
on_cursor_changed (GtkTreeView * tview, MugMsgListView * lst)
{ {
GtkTreeSelection *sel; GtkTreeSelection *sel;
GtkTreeIter iter; GtkTreeIter iter;
@ -170,7 +173,8 @@ append_col(GtkTreeView * treeview, const char *label, int colidx,
gtk_tree_view_append_column (treeview, col); gtk_tree_view_append_column (treeview, col);
} }
static void mug_msg_list_view_init(MugMsgListView * obj) static void
mug_msg_list_view_init (MugMsgListView * obj)
{ {
MugMsgListViewPrivate *priv; MugMsgListViewPrivate *priv;
GtkTreeView *tview; GtkTreeView *tview;
@ -207,7 +211,8 @@ static void mug_msg_list_view_init(MugMsgListView * obj)
G_CALLBACK (on_cursor_changed), obj); G_CALLBACK (on_cursor_changed), obj);
} }
static void mug_msg_list_view_finalize(GObject * obj) static void
mug_msg_list_view_finalize (GObject * obj)
{ {
MugMsgListViewPrivate *priv; MugMsgListViewPrivate *priv;
priv = MUG_MSG_LIST_VIEW_GET_PRIVATE (obj); priv = MUG_MSG_LIST_VIEW_GET_PRIVATE (obj);
@ -221,7 +226,8 @@ static void mug_msg_list_view_finalize(GObject * obj)
G_OBJECT_CLASS (parent_class)->finalize (obj); G_OBJECT_CLASS (parent_class)->finalize (obj);
} }
void mug_msg_list_view_move_first(MugMsgListView * self) void
mug_msg_list_view_move_first (MugMsgListView * self)
{ {
GtkTreePath *path; GtkTreePath *path;
@ -233,7 +239,8 @@ void mug_msg_list_view_move_first(MugMsgListView * self)
gtk_tree_path_free (path); gtk_tree_path_free (path);
} }
static gboolean msg_list_view_move(MugMsgListView * self, gboolean next) static gboolean
msg_list_view_move (MugMsgListView * self, gboolean next)
{ {
GtkTreePath *path; GtkTreePath *path;
@ -252,21 +259,24 @@ static gboolean msg_list_view_move(MugMsgListView * self, gboolean next)
return TRUE; return TRUE;
} }
gboolean mug_msg_list_view_move_next(MugMsgListView * self) gboolean
mug_msg_list_view_move_next (MugMsgListView * self)
{ {
g_return_val_if_fail (MUG_IS_MSG_LIST_VIEW (self), FALSE); g_return_val_if_fail (MUG_IS_MSG_LIST_VIEW (self), FALSE);
return msg_list_view_move (self, TRUE); return msg_list_view_move (self, TRUE);
} }
gboolean mug_msg_list_view_move_prev(MugMsgListView * self) gboolean
mug_msg_list_view_move_prev (MugMsgListView * self)
{ {
g_return_val_if_fail (MUG_IS_MSG_LIST_VIEW (self), FALSE); g_return_val_if_fail (MUG_IS_MSG_LIST_VIEW (self), FALSE);
return msg_list_view_move (self, FALSE); return msg_list_view_move (self, FALSE);
} }
GtkWidget *mug_msg_list_view_new(const char *xpath) GtkWidget *
mug_msg_list_view_new (const char *xpath)
{ {
GtkWidget *w; GtkWidget *w;
MugMsgListViewPrivate *priv; MugMsgListViewPrivate *priv;
@ -281,7 +291,8 @@ GtkWidget *mug_msg_list_view_new(const char *xpath)
return w; return w;
} }
static gchar *empty_or_display_contact(const gchar * str) static gchar *
empty_or_display_contact (const gchar * str)
{ {
if (!str || *str == '\0') if (!str || *str == '\0')
return g_strdup ("-"); return g_strdup ("-");
@ -290,7 +301,8 @@ static gchar *empty_or_display_contact(const gchar * str)
} }
static MugError mu_result_to_mug_error(MuResult r) static MugError
mu_result_to_mug_error (MuResult r)
{ {
switch (r) { switch (r) {
case MU_ERROR_XAPIAN_DIR: case MU_ERROR_XAPIAN_DIR:
@ -304,8 +316,8 @@ static MugError mu_result_to_mug_error(MuResult r)
} }
} }
static MuMsgIter *run_query(const char *xpath, const char *query, static MuMsgIter *
MugMsgListView * self) run_query (const char *xpath, const char *query, MugMsgListView * self)
{ {
GError *err; GError *err;
MuQuery *xapian; MuQuery *xapian;
@ -322,7 +334,8 @@ static MuMsgIter *run_query(const char *xpath, const char *query,
return NULL; return NULL;
} }
iter = mu_query_run(xapian, query, MU_MSG_FIELD_ID_DATE, TRUE, 0, &err); iter =
mu_query_run (xapian, query, MU_MSG_FIELD_ID_DATE, TRUE, 0, &err);
mu_query_destroy (xapian); mu_query_destroy (xapian);
if (!iter) { if (!iter) {
g_warning ("Error: %s", err->message); g_warning ("Error: %s", err->message);
@ -336,7 +349,8 @@ static MuMsgIter *run_query(const char *xpath, const char *query,
return iter; return iter;
} }
static void add_row(GtkListStore * store, MuMsgIter * iter) static void
add_row (GtkListStore * store, MuMsgIter * iter)
{ {
GtkTreeIter treeiter; GtkTreeIter treeiter;
const gchar *datestr, *flagstr; const gchar *datestr, *flagstr;
@ -387,7 +401,8 @@ update_model(GtkListStore * store, const char *xpath, const char *query,
return count; return count;
} }
int mug_msg_list_view_query(MugMsgListView * self, const char *query) int
mug_msg_list_view_query (MugMsgListView * self, const char *query)
{ {
MugMsgListViewPrivate *priv; MugMsgListViewPrivate *priv;
gboolean rv; gboolean rv;
@ -410,7 +425,8 @@ int mug_msg_list_view_query(MugMsgListView * self, const char *query)
return rv; return rv;
} }
const gchar *mug_msg_list_view_get_query(MugMsgListView * self) const gchar *
mug_msg_list_view_get_query (MugMsgListView * self)
{ {
g_return_val_if_fail (MUG_IS_MSG_LIST_VIEW (self), NULL); g_return_val_if_fail (MUG_IS_MSG_LIST_VIEW (self), NULL);

22
toys/mug/mug-msg-list-view.h
View File

@ -55,20 +55,28 @@ struct _MugMsgListViewClass {
}; };
/* member functions */ /* member functions */
GType mug_msg_list_view_get_type(void) G_GNUC_CONST; GType
mug_msg_list_view_get_type (void)
G_GNUC_CONST;
/* parameter-less _new function (constructor) */ /* parameter-less _new function (constructor) */
/* if this is a kind of GtkWidget, it should probably return at GtkWidget* */ /* if this is a kind of GtkWidget, it should probably return at GtkWidget* */
GtkWidget *mug_msg_list_view_new(const char *xpath); GtkWidget *
mug_msg_list_view_new (const char *xpath);
int mug_msg_list_view_query(MugMsgListView * self, const char *query); int
mug_msg_list_view_query (MugMsgListView * self, const char *query);
void mug_msg_list_view_move_first(MugMsgListView * self); void
mug_msg_list_view_move_first (MugMsgListView * self);
gboolean mug_msg_list_view_move_prev(MugMsgListView * self); gboolean
gboolean mug_msg_list_view_move_next(MugMsgListView * self); mug_msg_list_view_move_prev (MugMsgListView * self);
gboolean
mug_msg_list_view_move_next (MugMsgListView * self);
const gchar *mug_msg_list_view_get_query(MugMsgListView * self); const gchar *
mug_msg_list_view_get_query (MugMsgListView * self);
G_END_DECLS G_END_DECLS
#endif /* __MUG_MSG_LIST_VIEW_H__ */ #endif /* __MUG_MSG_LIST_VIEW_H__ */

61
toys/mug/mug-msg-view.c
View File

@ -85,7 +85,8 @@ static GtkVBoxClass *parent_class = NULL;
G_DEFINE_TYPE (MugMsgView, mug_msg_view, GTK_TYPE_VBOX); G_DEFINE_TYPE (MugMsgView, mug_msg_view, GTK_TYPE_VBOX);
static void mug_msg_view_class_init(MugMsgViewClass * klass) static void
mug_msg_view_class_init (MugMsgViewClass * klass)
{ {
GObjectClass *gobject_class; GObjectClass *gobject_class;
gobject_class = (GObjectClass *) klass; gobject_class = (GObjectClass *) klass;
@ -103,8 +104,8 @@ static void mug_msg_view_class_init(MugMsgViewClass * klass)
/* etc. */ /* etc. */
} }
static GtkWidget *create_table(MugMsgViewPrivate * priv, static GtkWidget *
const HeaderInfo * hinfo, guint num) create_table (MugMsgViewPrivate * priv, const HeaderInfo * hinfo, guint num)
{ {
guint i; guint i;
GtkWidget *table; GtkWidget *table;
@ -146,7 +147,8 @@ static GtkWidget *create_table(MugMsgViewPrivate * priv,
return table; return table;
} }
static GtkWidget *headers_area(MugMsgViewPrivate * priv) static GtkWidget *
headers_area (MugMsgViewPrivate * priv)
{ {
GtkWidget *scrolled, *vbox; GtkWidget *scrolled, *vbox;
@ -155,7 +157,8 @@ static GtkWidget *headers_area(MugMsgViewPrivate * priv)
priv->_tableexpander = create_table priv->_tableexpander = create_table
(priv, HEADER_INFO_EXPANDER, G_N_ELEMENTS (HEADER_INFO_EXPANDER)); (priv, HEADER_INFO_EXPANDER, G_N_ELEMENTS (HEADER_INFO_EXPANDER));
priv->_expander = gtk_expander_new ("Details"); priv->_expander = gtk_expander_new ("Details");
gtk_container_add(GTK_CONTAINER(priv->_expander), priv->_tableexpander); gtk_container_add (GTK_CONTAINER (priv->_expander),
priv->_tableexpander);
vbox = gtk_vbox_new (FALSE, FALSE); vbox = gtk_vbox_new (FALSE, FALSE);
gtk_box_pack_start (GTK_BOX (vbox), priv->_tablemain, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), priv->_tablemain, FALSE, FALSE, 0);
@ -171,7 +174,8 @@ static GtkWidget *headers_area(MugMsgViewPrivate * priv)
return priv->_headers_area = scrolled; return priv->_headers_area = scrolled;
} }
static void mug_msg_view_init(MugMsgView * obj) static void
mug_msg_view_init (MugMsgView * obj)
{ {
MugMsgViewPrivate *priv; MugMsgViewPrivate *priv;
GtkWidget *scrolled; GtkWidget *scrolled;
@ -189,22 +193,26 @@ static void mug_msg_view_init(MugMsgView * obj)
GTK_POLICY_AUTOMATIC); GTK_POLICY_AUTOMATIC);
gtk_container_add (GTK_CONTAINER (scrolled), priv->_view); gtk_container_add (GTK_CONTAINER (scrolled), priv->_view);
gtk_box_pack_start(GTK_BOX(obj), headers_area(priv), FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (obj), headers_area (priv), FALSE, FALSE,
0);
gtk_box_pack_start (GTK_BOX (obj), scrolled, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (obj), scrolled, TRUE, TRUE, 0);
} }
static void mug_msg_view_finalize(GObject * obj) static void
mug_msg_view_finalize (GObject * obj)
{ {
/* free/unref instance resources here */ /* free/unref instance resources here */
G_OBJECT_CLASS (parent_class)->finalize (obj); G_OBJECT_CLASS (parent_class)->finalize (obj);
} }
GtkWidget *mug_msg_view_new(void) GtkWidget *
mug_msg_view_new (void)
{ {
return GTK_WIDGET (g_object_new (MUG_TYPE_MSG_VIEW, NULL)); return GTK_WIDGET (g_object_new (MUG_TYPE_MSG_VIEW, NULL));
} }
static void empty_message(MugMsgView * self) static void
empty_message (MugMsgView * self)
{ {
int i; int i;
MugMsgViewPrivate *priv; MugMsgViewPrivate *priv;
@ -219,7 +227,8 @@ static void empty_message(MugMsgView * self)
gtk_text_buffer_set_text (buf, "", -1); gtk_text_buffer_set_text (buf, "", -1);
} }
static gboolean set_text(MugMsgView * self, const char *txt) static gboolean
set_text (MugMsgView * self, const char *txt)
{ {
MugMsgViewPrivate *priv; MugMsgViewPrivate *priv;
GtkTextBuffer *buf; GtkTextBuffer *buf;
@ -233,31 +242,20 @@ static gboolean set_text(MugMsgView * self, const char *txt)
return TRUE; return TRUE;
} }
static void fill_header(MugMsgViewPrivate * priv, MuMsg * msg) static void
fill_header (MugMsgViewPrivate * priv, MuMsg * msg)
{ {
int i; int i;
for (i = 0; i != HEADER_ROW_NUM; ++i) { for (i = 0; i != HEADER_ROW_NUM; ++i) {
const gchar *val; const gchar *val;
switch (i) { switch (i) {
case HEADER_ROW_FROM: case HEADER_ROW_FROM: val = mu_msg_get_from (msg); break;
val = mu_msg_get_from(msg); case HEADER_ROW_TO: val = mu_msg_get_to (msg); break;
break; case HEADER_ROW_SUBJECT: val = mu_msg_get_subject (msg); break;
case HEADER_ROW_TO: case HEADER_ROW_MSGID: val = mu_msg_get_msgid (msg);break;
val = mu_msg_get_to(msg); case HEADER_ROW_CC: val = mu_msg_get_cc (msg); break;
break; case HEADER_ROW_PATH: val = mu_msg_get_path (msg); break;
case HEADER_ROW_SUBJECT:
val = mu_msg_get_subject(msg);
break;
case HEADER_ROW_MSGID:
val = mu_msg_get_msgid(msg);
break;
case HEADER_ROW_CC:
val = mu_msg_get_cc(msg);
break;
case HEADER_ROW_PATH:
val = mu_msg_get_path(msg);
break;
case HEADER_ROW_DATE: case HEADER_ROW_DATE:
val = mu_str_date_s ("%c", mu_msg_get_date (msg)); val = mu_str_date_s ("%c", mu_msg_get_date (msg));
break; break;
@ -278,7 +276,8 @@ static void fill_header(MugMsgViewPrivate * priv, MuMsg * msg)
} }
} }
gboolean mug_msg_view_set_msg(MugMsgView * self, const char *msgpath) gboolean
mug_msg_view_set_msg (MugMsgView * self, const char *msgpath)
{ {
MugMsgViewPrivate *priv; MugMsgViewPrivate *priv;
MuMsg *msg; MuMsg *msg;

10
toys/mug/mug-msg-view.h
View File

@ -46,12 +46,16 @@ struct _MugMsgViewClass {
}; };
/* member functions */ /* member functions */
GType mug_msg_view_get_type(void) G_GNUC_CONST; GType
mug_msg_view_get_type (void)
G_GNUC_CONST;
/* parameter-less _new function (constructor) */ /* parameter-less _new function (constructor) */
/* if this is a kind of GtkWidget, it should probably return at GtkWidget* */ /* if this is a kind of GtkWidget, it should probably return at GtkWidget* */
GtkWidget *mug_msg_view_new(void); GtkWidget *
gboolean mug_msg_view_set_msg(MugMsgView * self, const char *msgpath); mug_msg_view_new (void);
gboolean
mug_msg_view_set_msg (MugMsgView * self, const char *msgpath);
G_END_DECLS G_END_DECLS
#endif /* __MUG_MSG_VIEW_H__ */ #endif /* __MUG_MSG_VIEW_H__ */

21
toys/mug/mug-query-bar.c
View File

@ -28,7 +28,8 @@ static GtkContainerClass *parent_class = NULL;
static guint signals[LAST_SIGNAL] = { 0 }; static guint signals[LAST_SIGNAL] = { 0 };
GType mug_query_bar_get_type(void) GType
mug_query_bar_get_type (void)
{ {
static GType my_type = 0; static GType my_type = 0;
if (!my_type) { if (!my_type) {
@ -50,7 +51,8 @@ GType mug_query_bar_get_type(void)
return my_type; return my_type;
} }
static void mug_query_bar_class_init(MugQueryBarClass * klass) static void
mug_query_bar_class_init (MugQueryBarClass * klass)
{ {
GObjectClass *gobject_class; GObjectClass *gobject_class;
gobject_class = (GObjectClass *) klass; gobject_class = (GObjectClass *) klass;
@ -71,7 +73,8 @@ static void mug_query_bar_class_init(MugQueryBarClass * klass)
G_TYPE_NONE, 1, G_TYPE_STRING); G_TYPE_NONE, 1, G_TYPE_STRING);
} }
static void on_entry_activated(GtkWidget * w, MugQueryBar * bar) static void
on_entry_activated (GtkWidget * w, MugQueryBar * bar)
{ {
MugQueryBarPrivate *priv; MugQueryBarPrivate *priv;
@ -81,7 +84,8 @@ static void on_entry_activated(GtkWidget * w, MugQueryBar * bar)
gtk_entry_get_text (GTK_ENTRY (w))); gtk_entry_get_text (GTK_ENTRY (w)));
} }
static void mug_query_bar_init(MugQueryBar * obj) static void
mug_query_bar_init (MugQueryBar * obj)
{ {
MugQueryBarPrivate *priv; MugQueryBarPrivate *priv;
@ -95,13 +99,15 @@ static void mug_query_bar_init(MugQueryBar * obj)
gtk_box_pack_start (GTK_BOX (obj), priv->_entry, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (obj), priv->_entry, TRUE, TRUE, 0);
} }
static void mug_query_bar_finalize(GObject * obj) static void
mug_query_bar_finalize (GObject * obj)
{ {
/* free/unref instance resources here */ /* free/unref instance resources here */
G_OBJECT_CLASS (parent_class)->finalize (obj); G_OBJECT_CLASS (parent_class)->finalize (obj);
} }
GtkWidget *mug_query_bar_new(void) GtkWidget *
mug_query_bar_new (void)
{ {
return GTK_WIDGET (g_object_new (MUG_TYPE_QUERY_BAR, NULL)); return GTK_WIDGET (g_object_new (MUG_TYPE_QUERY_BAR, NULL));
} }
@ -120,7 +126,8 @@ mug_query_bar_set_query(MugQueryBar * self, const char *query, gboolean run)
on_entry_activated (priv->_entry, self); on_entry_activated (priv->_entry, self);
} }
void mug_query_bar_grab_focus(MugQueryBar * self) void
mug_query_bar_grab_focus (MugQueryBar * self)
{ {
g_return_if_fail (MUG_IS_QUERY_BAR (self)); g_return_if_fail (MUG_IS_QUERY_BAR (self));

14
toys/mug/mug-query-bar.h
View File

@ -30,16 +30,20 @@ struct _MugQueryBarClass {
}; };
/* member functions */ /* member functions */
GType mug_query_bar_get_type(void) G_GNUC_CONST; GType
mug_query_bar_get_type (void)
G_GNUC_CONST;
/* parameter-less _new function (constructor) */ /* parameter-less _new function (constructor) */
/* if this is a kind of GtkWidget, it should probably return at GtkWidget* */ /* if this is a kind of GtkWidget, it should probably return at GtkWidget* */
GtkWidget *mug_query_bar_new(void); GtkWidget *
mug_query_bar_new (void);
void mug_query_bar_grab_focus(MugQueryBar * self); void
mug_query_bar_grab_focus (MugQueryBar * self);
void mug_query_bar_set_query(MugQueryBar * self, const char *query, void
gboolean run); mug_query_bar_set_query (MugQueryBar * self, const char *query, gboolean run);
G_END_DECLS G_END_DECLS
#endif /* __MUG_QUERY_BAR_H__ */ #endif /* __MUG_QUERY_BAR_H__ */

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

@ -51,7 +51,8 @@ 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; GObjectClass *gobject_class;
gobject_class = (GObjectClass *) klass; gobject_class = (GObjectClass *) klass;
@ -76,7 +77,8 @@ static void mug_shortcuts_class_init(MugShortcutsClass * klass)
/* etc. */ /* etc. */
} }
static void mug_shortcuts_init(MugShortcuts * obj) static void
mug_shortcuts_init (MugShortcuts * obj)
{ {
obj->_priv = MUG_SHORTCUTS_GET_PRIVATE (obj); obj->_priv = MUG_SHORTCUTS_GET_PRIVATE (obj);
@ -86,13 +88,15 @@ static void mug_shortcuts_init(MugShortcuts * obj)
gtk_box_pack_start (GTK_BOX (obj), obj->_priv->_bbox, TRUE, TRUE, 0); 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 */ /* 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), g_signal_emit (G_OBJECT (self),
signals[SHORTCUT_CLICKED], 0, signals[SHORTCUT_CLICKED], 0,
@ -100,7 +104,8 @@ static void on_button_clicked(GtkWidget * button, MugShortcuts * self)
MUG_SHORTCUT_BOOKMARK)); 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; GtkWidget *button;
@ -113,7 +118,8 @@ static void each_bookmark(const char *key, const char *val, MugShortcuts * self)
gtk_container_add (GTK_CONTAINER (self->_priv->_bbox), button); 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; MuBookmarks *bookmarks;
@ -128,7 +134,8 @@ static gboolean init_shortcuts(MugShortcuts * self, const char *bmpath)
return TRUE; return TRUE;
} }
GtkWidget *mug_shortcuts_new(const char *bmpath) GtkWidget *
mug_shortcuts_new (const char *bmpath)
{ {
MugShortcuts *self; MugShortcuts *self;

7
toys/mug/mug-shortcuts.h
View File

@ -49,11 +49,14 @@ struct _MugShortcutsClass {
}; };
/* member functions */ /* member functions */
GType mug_shortcuts_get_type(void) G_GNUC_CONST; GType
mug_shortcuts_get_type (void)
G_GNUC_CONST;
/* parameter-less _new function (constructor) */ /* parameter-less _new function (constructor) */
/* if this is a kind of GtkWidget, it should probably return at GtkWidget* */ /* if this is a kind of GtkWidget, it should probably return at GtkWidget* */
GtkWidget *mug_shortcuts_new(const char *bmpath); GtkWidget *
mug_shortcuts_new (const char *bmpath);
/* fill in other public functions, e.g.: */ /* fill in other public functions, e.g.: */
/* void mug_shortcuts_do_something (MugShortcuts *self, const gchar* param); */ /* void mug_shortcuts_do_something (MugShortcuts *self, const gchar* param); */

97
toys/mug/mug.cc
View File

@ -44,7 +44,8 @@ struct _MugData {
}; };
typedef struct _MugData MugData; typedef struct _MugData MugData;
static void about_mug(MugData * mugdata) static void
about_mug (MugData * mugdata)
{ {
GtkWidget *about; GtkWidget *about;
about = gtk_message_dialog_new about = gtk_message_dialog_new
@ -68,11 +69,11 @@ enum _ToolAction {
}; };
typedef enum _ToolAction ToolAction; typedef enum _ToolAction ToolAction;
static void on_tool_button_clicked(GtkToolButton * btn, MugData * mugdata) static void
on_tool_button_clicked (GtkToolButton * btn, MugData * mugdata)
{ {
ToolAction action; ToolAction action;
action = action = (ToolAction)
(ToolAction)
GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (btn), "action")); GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (btn), "action"));
switch (action) { switch (action) {
@ -80,10 +81,12 @@ static void on_tool_button_clicked(GtkToolButton * btn, MugData * mugdata)
gtk_main_quit (); gtk_main_quit ();
break; break;
case ACTION_NEXT_MSG: case ACTION_NEXT_MSG:
mug_msg_list_view_move_next(MUG_MSG_LIST_VIEW(mugdata->mlist)); mug_msg_list_view_move_next (MUG_MSG_LIST_VIEW
(mugdata->mlist));
break; break;
case ACTION_PREV_MSG: case ACTION_PREV_MSG:
mug_msg_list_view_move_prev(MUG_MSG_LIST_VIEW(mugdata->mlist)); mug_msg_list_view_move_prev (MUG_MSG_LIST_VIEW
(mugdata->mlist));
break; break;
case ACTION_ABOUT: case ACTION_ABOUT:
about_mug (mugdata); about_mug (mugdata);
@ -93,7 +96,23 @@ static void on_tool_button_clicked(GtkToolButton * btn, MugData * mugdata)
} }
} }
static GtkWidget *mug_toolbar(MugData * mugdata) static GtkToolItem*
get_connected_tool_button (const char* stock_id, ToolAction action,
MugData *mugdata)
{
GtkToolItem *btn;
btn = gtk_tool_button_new_from_stock (stock_id);
g_object_set_data (G_OBJECT (btn), "action",
GUINT_TO_POINTER (action));
g_signal_connect (G_OBJECT (btn), "clicked",
G_CALLBACK (on_tool_button_clicked),
mugdata);
return btn;
}
static GtkWidget *
mug_toolbar (MugData * mugdata)
{ {
GtkWidget *toolbar; GtkWidget *toolbar;
int i; int i;
@ -101,31 +120,24 @@ static GtkWidget *mug_toolbar(MugData * mugdata)
const char *stock_id; const char *stock_id;
ToolAction action; ToolAction action;
} tools[] = { } tools[] = {
{ {GTK_STOCK_GO_UP, ACTION_PREV_MSG},
GTK_STOCK_GO_UP, ACTION_PREV_MSG}, { {GTK_STOCK_GO_DOWN, ACTION_NEXT_MSG},
GTK_STOCK_GO_DOWN, ACTION_NEXT_MSG}, { {NULL, ACTION_SEPARATOR},
NULL, ACTION_SEPARATOR}, { {GTK_STOCK_ABOUT, ACTION_ABOUT},
GTK_STOCK_ABOUT, ACTION_ABOUT}, { {NULL, ACTION_SEPARATOR},
NULL, ACTION_SEPARATOR}, { {GTK_STOCK_QUIT, ACTION_DO_QUIT}};
GTK_STOCK_QUIT, ACTION_DO_QUIT},};
toolbar = gtk_toolbar_new (); toolbar = gtk_toolbar_new ();
for (i = 0; i != G_N_ELEMENTS (tools); ++i) { for (i = 0; i != G_N_ELEMENTS (tools); ++i) {
GtkToolItem *btn; if (tools[i].action == ACTION_SEPARATOR) { /* separator? */
if (tools[i].action == ACTION_SEPARATOR) { /* separator */
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), gtk_toolbar_insert (GTK_TOOLBAR (toolbar),
gtk_separator_tool_item_new (), i); gtk_separator_tool_item_new (), i);
continue; continue;
} } else /* nope: a real item */
gtk_toolbar_insert (GTK_TOOLBAR (toolbar),
/* nope: a real item */ get_connected_tool_button
btn = gtk_tool_button_new_from_stock(tools[i].stock_id); (tools[i].stock_id, tools[i].action,
g_object_set_data(G_OBJECT(btn), "action", mugdata), i);
GUINT_TO_POINTER(tools[i].action));
g_signal_connect(G_OBJECT(btn), "clicked",
G_CALLBACK(on_tool_button_clicked), mugdata);
gtk_toolbar_insert(GTK_TOOLBAR(toolbar), btn, i);
gtk_widget_show(GTK_WIDGET(btn));
} }
return toolbar; return toolbar;
@ -137,7 +149,8 @@ on_shortcut_clicked(GtkWidget * w, const gchar * query, MugData * mdata)
mug_query_bar_set_query (MUG_QUERY_BAR (mdata->querybar), query, TRUE); mug_query_bar_set_query (MUG_QUERY_BAR (mdata->querybar), query, TRUE);
} }
static GtkWidget *mug_shortcuts_bar(MugData * data) static GtkWidget *
mug_shortcuts_bar (MugData * data)
{ {
data->shortcuts = mug_shortcuts_new (mu_runtime_bookmarks_file ()); data->shortcuts = mug_shortcuts_new (mu_runtime_bookmarks_file ());
@ -147,7 +160,8 @@ static GtkWidget *mug_shortcuts_bar(MugData * data)
return data->shortcuts; return data->shortcuts;
} }
static GtkWidget *mug_statusbar(void) static GtkWidget *
mug_statusbar (void)
{ {
GtkWidget *statusbar; GtkWidget *statusbar;
@ -168,16 +182,17 @@ on_query_changed(MugQueryBar * bar, const char *query, MugData * mugdata)
count = mug_msg_list_view_query (MUG_MSG_LIST_VIEW (mugdata->mlist), count = mug_msg_list_view_query (MUG_MSG_LIST_VIEW (mugdata->mlist),
query); query);
if (count >= 0) { if (count >= 0) {
gchar *msg = g_strdup_printf("%d message%s found matching '%s'", gchar *msg =
g_strdup_printf ("%d message%s found matching '%s'",
count, count,
count > 1 ? "s" : "", count > 1 ? "s" : "",
mug_msg_list_view_get_query mug_msg_list_view_get_query
(MUG_MSG_LIST_VIEW (MUG_MSG_LIST_VIEW (mugdata->mlist)));
(mugdata->mlist)));
gtk_statusbar_push (GTK_STATUSBAR (mugdata->statusbar), 0, msg); gtk_statusbar_push (GTK_STATUSBAR (mugdata->statusbar), 0, msg);
g_free (msg); g_free (msg);
mug_msg_list_view_move_first(MUG_MSG_LIST_VIEW(mugdata->mlist)); mug_msg_list_view_move_first (MUG_MSG_LIST_VIEW
(mugdata->mlist));
gtk_widget_grab_focus (GTK_WIDGET (mugdata->mlist)); gtk_widget_grab_focus (GTK_WIDGET (mugdata->mlist));
} }
@ -228,7 +243,8 @@ on_list_view_error(MugMsgListView * mlist, MugError err, MugData * mugdata)
} }
} }
static GtkWidget *mug_querybar(void) static GtkWidget *
mug_querybar (void)
{ {
GtkWidget *querybar; GtkWidget *querybar;
@ -237,7 +253,8 @@ static GtkWidget *mug_querybar(void)
return querybar; return querybar;
} }
static GtkWidget *mug_query_area(MugData * mugdata) static GtkWidget *
mug_query_area (MugData * mugdata)
{ {
GtkWidget *queryarea; GtkWidget *queryarea;
GtkWidget *paned; GtkWidget *paned;
@ -276,7 +293,8 @@ static GtkWidget *mug_query_area(MugData * mugdata)
return queryarea; return queryarea;
} }
static GtkWidget *mug_main_area(MugData * mugdata) static GtkWidget *
mug_main_area (MugData * mugdata)
{ {
GtkWidget *mainarea, *w; GtkWidget *mainarea, *w;
mainarea = gtk_hbox_new (FALSE, 5); mainarea = gtk_hbox_new (FALSE, 5);
@ -292,7 +310,8 @@ static GtkWidget *mug_main_area(MugData * mugdata)
return mainarea; return mainarea;
} }
GtkWidget *mug_shell(MugData * mugdata) GtkWidget *
mug_shell (MugData * mugdata)
{ {
GtkWidget *vbox; GtkWidget *vbox;
gchar *icon; gchar *icon;
@ -307,7 +326,8 @@ GtkWidget *mug_shell(MugData * mugdata)
TRUE, 2); TRUE, 2);
mugdata->statusbar = mug_statusbar (); mugdata->statusbar = mug_statusbar ();
gtk_box_pack_start(GTK_BOX(vbox), mugdata->statusbar, FALSE, FALSE, 2); gtk_box_pack_start (GTK_BOX (vbox), mugdata->statusbar, FALSE, FALSE,
2);
gtk_container_add (GTK_CONTAINER (mugdata->win), vbox); gtk_container_add (GTK_CONTAINER (mugdata->win), vbox);
gtk_widget_show_all (vbox); gtk_widget_show_all (vbox);
@ -322,7 +342,8 @@ GtkWidget *mug_shell(MugData * mugdata)
return mugdata->win; return mugdata->win;
} }
int main(int argc, char *argv[]) int
main (int argc, char *argv[])
{ {
MugData mugdata; MugData mugdata;
GtkWidget *mugshell; GtkWidget *mugshell;