From 2cbae7f6a5596e15835e73c76c684ecae0c6336e Mon Sep 17 00:00:00 2001 From: Berke Viktor Date: Mon, 22 Oct 2012 06:18:32 +0200 Subject: [PATCH] Get rid of gui_tweaks 32 --- src/common/cfgfiles.c | 1 + src/common/xchat.h | 1 + src/fe-gtk/chanview-tree.c | 4 ++-- src/fe-gtk/userlistgui.c | 6 +++--- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/common/cfgfiles.c b/src/common/cfgfiles.c index 5d1b0b09..f9b2f65c 100644 --- a/src/common/cfgfiles.c +++ b/src/common/cfgfiles.c @@ -442,6 +442,7 @@ const struct prefs vars[] = { {"gui_auto_open_send", P_OFFINT (autoopendccsendwindow), TYPE_BOOL}, {"gui_chanlist_maxusers", P_OFFINT (gui_chanlist_maxusers), TYPE_INT}, {"gui_chanlist_minusers", P_OFFINT (gui_chanlist_minusers), TYPE_INT}, + {"gui_compact", P_OFFINT (gui_compact), TYPE_BOOL}, {"gui_dialog_height", P_OFFINT (dialog_height), TYPE_INT}, {"gui_dialog_left", P_OFFINT (dialog_left), TYPE_INT}, {"gui_dialog_top", P_OFFINT (dialog_top), TYPE_INT}, diff --git a/src/common/xchat.h b/src/common/xchat.h index 0329cb47..668d1f98 100644 --- a/src/common/xchat.h +++ b/src/common/xchat.h @@ -292,6 +292,7 @@ struct xchatprefs unsigned int thin_separator; unsigned int auto_indent; unsigned int wordwrap; + unsigned int gui_compact; unsigned int gui_input_spell; unsigned int gui_tray; unsigned int gui_tray_flags; diff --git a/src/fe-gtk/chanview-tree.c b/src/fe-gtk/chanview-tree.c index 88d1662b..dee52228 100644 --- a/src/fe-gtk/chanview-tree.c +++ b/src/fe-gtk/chanview-tree.c @@ -110,7 +110,7 @@ cv_tree_init (chanview *cv) if (cv->use_icons) { renderer = gtk_cell_renderer_pixbuf_new (); - if (prefs.gui_tweaks & 32) + if (prefs.gui_compact) g_object_set (G_OBJECT (renderer), "ypad", 0, NULL); gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (view), -1, NULL, renderer, @@ -119,7 +119,7 @@ cv_tree_init (chanview *cv) /* main column */ renderer = gtk_cell_renderer_text_new (); - if (prefs.gui_tweaks & 32) + if (prefs.gui_compact) g_object_set (G_OBJECT (renderer), "ypad", 0, NULL); gtk_cell_renderer_text_set_fixed_height_from_font (GTK_CELL_RENDERER_TEXT (renderer), 1); gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (view), diff --git a/src/fe-gtk/userlistgui.c b/src/fe-gtk/userlistgui.c index f79aca51..cb21703f 100644 --- a/src/fe-gtk/userlistgui.c +++ b/src/fe-gtk/userlistgui.c @@ -482,7 +482,7 @@ userlist_add_columns (GtkTreeView * treeview) /* icon column */ renderer = gtk_cell_renderer_pixbuf_new (); - if (prefs.gui_tweaks & 32) + if (prefs.gui_compact) g_object_set (G_OBJECT (renderer), "ypad", 0, NULL); gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview), -1, NULL, renderer, @@ -490,7 +490,7 @@ userlist_add_columns (GtkTreeView * treeview) /* nick column */ renderer = gtk_cell_renderer_text_new (); - if (prefs.gui_tweaks & 32) + if (prefs.gui_compact) g_object_set (G_OBJECT (renderer), "ypad", 0, NULL); gtk_cell_renderer_text_set_fixed_height_from_font (GTK_CELL_RENDERER_TEXT (renderer), 1); gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview), @@ -501,7 +501,7 @@ userlist_add_columns (GtkTreeView * treeview) { /* hostname column */ renderer = gtk_cell_renderer_text_new (); - if (prefs.gui_tweaks & 32) + if (prefs.gui_compact) g_object_set (G_OBJECT (renderer), "ypad", 0, NULL); gtk_cell_renderer_text_set_fixed_height_from_font (GTK_CELL_RENDERER_TEXT (renderer), 1); gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),