HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use enum for Messages list store IDs

Browse Source
This commit is contained in:
Nick Treleaven 2014-04-30 16:11:48 +01:00
parent d78c8fb5d9
commit ff0fde30cb
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/msgwindow.c
View File

@ -66,6 +66,15 @@ ParseData;
MessageWindow msgwindow; MessageWindow msgwindow;
enum
{
MSG_COL_LINE = 0,
MSG_COL_DOC,
MSG_COL_COLOR,
MSG_COL_STRING,
MSG_COL_COUNT
};
static void prepare_msg_tree_view(void); static void prepare_msg_tree_view(void);
static void prepare_status_tree_view(void); static void prepare_status_tree_view(void);
@ -178,7 +187,7 @@ static void prepare_msg_tree_view(void)
GtkTreeSelection *selection; GtkTreeSelection *selection;
/* line, doc, fg, str */ /* line, doc, fg, str */
msgwindow.store_msg = gtk_list_store_new(4, G_TYPE_INT, G_TYPE_POINTER, msgwindow.store_msg = gtk_list_store_new(MSG_COL_COUNT, G_TYPE_INT, G_TYPE_POINTER,
GDK_TYPE_COLOR, G_TYPE_STRING); GDK_TYPE_COLOR, G_TYPE_STRING);
gtk_tree_view_set_model(GTK_TREE_VIEW(msgwindow.tree_msg), GTK_TREE_MODEL(msgwindow.store_msg)); gtk_tree_view_set_model(GTK_TREE_VIEW(msgwindow.tree_msg), GTK_TREE_MODEL(msgwindow.store_msg));
g_object_unref(msgwindow.store_msg); g_object_unref(msgwindow.store_msg);
@ -382,7 +391,8 @@ void msgwin_msg_add_string(gint msg_color, gint line, GeanyDocument *doc, const
utf8_msg = tmp; utf8_msg = tmp;
gtk_list_store_append(msgwindow.store_msg, &iter); gtk_list_store_append(msgwindow.store_msg, &iter);
gtk_list_store_set(msgwindow.store_msg, &iter, 0, line, 1, doc, 2, color, 3, utf8_msg, -1); gtk_list_store_set(msgwindow.store_msg, &iter,
MSG_COL_LINE, line, MSG_COL_DOC, doc, MSG_COL_COLOR, color, MSG_COL_STRING, utf8_msg, -1);
g_free(tmp); g_free(tmp);
if (utf8_msg != tmp) if (utf8_msg != tmp)
@ -1073,8 +1083,9 @@ gboolean msgwin_goto_messages_file_line(gboolean focus_editor)
GeanyDocument *doc; GeanyDocument *doc;
GeanyDocument *old_doc = document_get_current(); GeanyDocument *old_doc = document_get_current();
gtk_tree_model_get(model, &iter, 0, &line, 1, &doc, 3, &string, -1); gtk_tree_model_get(model, &iter,
/* doc may have been closed, so check doc->index: */ MSG_COL_LINE, &line, MSG_COL_DOC, &doc, MSG_COL_STRING, &string, -1);
/* doc may have been closed, so check doc is valid: */
if (line >= 0 && DOC_VALID(doc)) if (line >= 0 && DOC_VALID(doc))
{ {
ret = navqueue_goto_line(old_doc, doc, line); ret = navqueue_goto_line(old_doc, doc, line);