summaryrefslogtreecommitdiff
path: root/chat/gg2/patches/patch-ad
blob: 8c3ed8c85aab4d02382bdcc28fe2d498065be44e (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
$NetBSD: patch-ad,v 1.1 2005/01/17 20:15:28 kristerw Exp $

--- src/plugins/GUI/gui_preferences.c.orig	Mon Jan 17 20:45:38 2005
+++ src/plugins/GUI/gui_preferences.c	Mon Jan 17 20:49:24 2005
@@ -618,6 +618,8 @@
 #endif
 	GtkWidget *label0_align, *label1_align, *label2_align;
 	GtkWidget *label3_align;
+	GtkWidget *exp;
+	GtkWidget *frm;
 
 	chat_vbox = gtk_vbox_new(FALSE, 5);
 
@@ -694,8 +696,8 @@
 	gtk_table_set_row_spacings(GTK_TABLE(tabbox), 7);
 	gtk_table_set_col_spacings(GTK_TABLE(tabbox), 0);
 	
-	GtkWidget *exp = gtk_expander_new(_("More advanced options"));
-	GtkWidget *frm = gtk_frame_new(_("Default size of window"));
+	exp = gtk_expander_new(_("More advanced options"));
+	frm = gtk_frame_new(_("Default size of window"));
 	gtk_frame_set_shadow_type(GTK_FRAME(frm),GTK_SHADOW_ETCHED_OUT);
 	gtk_container_add(GTK_CONTAINER(frm), tabbox);
 	gtk_container_add(GTK_CONTAINER(exp), frm);
@@ -761,6 +763,7 @@
 	GtkWidget *combo_theme = NULL;
 	GtkWidget *combo_icons = NULL;
 	GtkWidget *notify_status_changes = NULL;
+	GtkWidget *entry;
 
 	gchar *dirname = NULL;
 	GDir *dir;
@@ -922,7 +925,7 @@
 	label = gtk_label_new(_("Web Browser:"));
 	gtk_container_add(GTK_CONTAINER(label4_align), label);
 
-	GtkWidget *entry = gtk_entry_new();
+	entry = gtk_entry_new();
 	gtk_table_attach_defaults(GTK_TABLE(tabbox2), label4_align, 0, 1, 0, 1);
 	gtk_table_attach_defaults(GTK_TABLE(tabbox2), entry, 1, 2, 0, 1);
 	g_object_set_data(G_OBJECT(adv_vbox), "browser_exec", entry);
@@ -975,6 +978,8 @@
 	gchar *previous_theme = ggadu_config_var_get(gui_handler, "theme");
 	gchar *previous_icons = ggadu_config_var_get(gui_handler, "icons");
 	gint response = -1;
+	GSList *combo_theme_slist;
+	GSList *combo_icons_slist;
 
 	print_debug("Preferences");
 
@@ -1325,7 +1330,7 @@
 		entry = g_object_get_data(G_OBJECT(adv_vbox), "combo_theme");
 		g_return_if_fail(entry != NULL);
 
-		GSList *combo_theme_slist = g_object_get_data(G_OBJECT(entry), "combo_theme_slist");
+		combo_theme_slist = g_object_get_data(G_OBJECT(entry), "combo_theme_slist");
 		ggadu_config_var_set(gui_handler, "theme", (gpointer) g_strdup(g_slist_nth_data(combo_theme_slist, gtk_combo_box_get_active(GTK_COMBO_BOX(entry)))));
 
 		g_slist_foreach(combo_theme_slist, (GFunc) g_free, NULL);
@@ -1333,7 +1338,7 @@
 
 		entry = g_object_get_data(G_OBJECT(adv_vbox), "combo_icons");
 		g_return_if_fail(entry != NULL);
-		GSList *combo_icons_slist = g_object_get_data(G_OBJECT(entry), "combo_icons_slist");
+		combo_icons_slist = g_object_get_data(G_OBJECT(entry), "combo_icons_slist");
 		ggadu_config_var_set(gui_handler, "icons", (gpointer) g_strdup(g_slist_nth_data(combo_icons_slist, gtk_combo_box_get_active(GTK_COMBO_BOX(entry)))));
 		g_slist_free(combo_icons_slist);