Variable cleanup for gui_*

This commit is contained in:
Berke Viktor
2012-10-22 13:49:28 +02:00
parent 87e903cd73
commit bf27d43052
20 changed files with 453 additions and 453 deletions

View File

@@ -187,7 +187,7 @@ servlist_networks_populate_ (GtkWidget *treeview, GSList *netlist, gboolean favo
gtk_list_store_insert_with_values (store, &iter, 0x7fffffff, 0, net->name, 1, 1, 2, 400, -1);
else
gtk_list_store_insert_with_values (store, &iter, 0x7fffffff, 0, net->name, 1, 1, 2, (net->flags & FLAG_FAVORITE) ? 800 : 400, -1);
if (i == prefs.slist_select)
if (i == prefs.hex_gui_slist_select)
{
/* select this network */
servlist_select_and_show (GTK_TREE_VIEW (treeview), &iter, store);
@@ -202,7 +202,7 @@ servlist_networks_populate_ (GtkWidget *treeview, GSList *netlist, gboolean favo
static void
servlist_networks_populate (GtkWidget *treeview, GSList *netlist)
{
servlist_networks_populate_ (treeview, netlist, prefs.slist_fav);
servlist_networks_populate_ (treeview, netlist, prefs.hex_gui_slist_fav);
}
static void
@@ -353,7 +353,7 @@ servlist_move_network (ircnet *net, int delta)
pos += delta;
if (pos >= 0)
{
/*prefs.slist_select += delta;*/
/*prefs.hex_gui_slist_select += delta;*/
network_list = g_slist_remove (network_list, net);
network_list = g_slist_insert (network_list, net, pos);
servlist_networks_populate (networks_tree, network_list);
@@ -624,7 +624,7 @@ servlist_find_selected_net (GtkTreeSelection *sel)
net = servlist_net_find (netname, &pos, strcmp);
g_free (netname);
if (net)
prefs.slist_select = pos;
prefs.hex_gui_slist_select = pos;
}
return net;
@@ -1340,18 +1340,18 @@ static void
no_servlist (GtkWidget * igad, gpointer serv)
{
if (GTK_TOGGLE_BUTTON (igad)->active)
prefs.slist_skip = TRUE;
prefs.hex_gui_slist_skip = TRUE;
else
prefs.slist_skip = FALSE;
prefs.hex_gui_slist_skip = FALSE;
}
static void
fav_servlist (GtkWidget * igad, gpointer serv)
{
if (GTK_TOGGLE_BUTTON (igad)->active)
prefs.slist_fav = TRUE;
prefs.hex_gui_slist_fav = TRUE;
else
prefs.slist_fav = FALSE;
prefs.hex_gui_slist_fav = FALSE;
servlist_networks_populate (networks_tree, network_list);
}
@@ -1801,7 +1801,7 @@ servlist_open_networks (void)
checkbutton_skip =
gtk_check_button_new_with_mnemonic (_("Skip network list on startup"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton_skip),
prefs.slist_skip);
prefs.hex_gui_slist_skip);
gtk_container_add (GTK_CONTAINER (hbox), checkbutton_skip);
g_signal_connect (G_OBJECT (checkbutton_skip), "toggled",
G_CALLBACK (no_servlist), 0);
@@ -1810,7 +1810,7 @@ servlist_open_networks (void)
checkbutton_fav =
gtk_check_button_new_with_mnemonic (_("Show favorites only"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton_fav),
prefs.slist_fav);
prefs.hex_gui_slist_fav);
gtk_container_add (GTK_CONTAINER (hbox), checkbutton_fav);
g_signal_connect (G_OBJECT (checkbutton_fav), "toggled",
G_CALLBACK (fav_servlist), 0);