comparison: src/prefs.c
src/prefs.c
- changeset 4892
- 37b4a5ac5ebe
- parent 4869
- e6d1486a7553
- child 4944
- 032dac83798e
equal
deleted
inserted
replaced
| 4891:ef1b39415657 | 4892:37b4a5ac5ebe |
|---|---|
| 240 gtk_list_store_set(smiley_theme_store, &iter, | 240 gtk_list_store_set(smiley_theme_store, &iter, |
| 241 0, pixbuf, | 241 0, pixbuf, |
| 242 1, description, | 242 1, description, |
| 243 2, theme->path, | 243 2, theme->path, |
| 244 -1); | 244 -1); |
| 245 g_object_unref(G_OBJECT(pixbuf)); | |
| 245 g_free(description); | 246 g_free(description); |
| 246 themes = themes->next; | 247 themes = themes->next; |
| 247 if (current_smiley_theme && !strcmp(theme->path, current_smiley_theme->path)) { | 248 if (current_smiley_theme && !strcmp(theme->path, current_smiley_theme->path)) { |
| 248 /* path = gtk_tree_path_new_from_indices(ind); */ | 249 /* path = gtk_tree_path_new_from_indices(ind); */ |
| 249 char *iwishihadgtk2_2 = g_strdup_printf("%d", ind); | 250 char *iwishihadgtk2_2 = g_strdup_printf("%d", ind); |
| 737 gaim_dropdown(vbox, _("Proxy _type:"), (int*)&global_proxy_info.proxytype, -1, | 738 gaim_dropdown(vbox, _("Proxy _type:"), (int*)&global_proxy_info.proxytype, -1, |
| 738 _("No proxy"), PROXY_NONE, | 739 _("No proxy"), PROXY_NONE, |
| 739 "SOCKS 4", PROXY_SOCKS4, | 740 "SOCKS 4", PROXY_SOCKS4, |
| 740 "SOCKS 5", PROXY_SOCKS5, | 741 "SOCKS 5", PROXY_SOCKS5, |
| 741 "HTTP", PROXY_HTTP, NULL); | 742 "HTTP", PROXY_HTTP, NULL); |
| 742 | |
| 743 table = gtk_table_new(2, 2, FALSE); | |
| 744 gtk_container_set_border_width(GTK_CONTAINER(table), 5); | |
| 745 gtk_table_set_col_spacings(GTK_TABLE(table), 5); | |
| 746 gtk_table_set_row_spacings(GTK_TABLE(table), 5); | |
| 747 | 743 |
| 748 vbox = make_frame(ret, _("Proxy Server")); | 744 vbox = make_frame(ret, _("Proxy Server")); |
| 749 prefs_proxy_frame = vbox; | 745 prefs_proxy_frame = vbox; |
| 750 | 746 |
| 751 if (global_proxy_info.proxytype == PROXY_NONE) | 747 if (global_proxy_info.proxytype == PROXY_NONE) |
| 1780 gtk_container_add (GTK_CONTAINER (frame), tree_v); | 1776 gtk_container_add (GTK_CONTAINER (frame), tree_v); |
| 1781 | 1777 |
| 1782 gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (tree_v), FALSE); | 1778 gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (tree_v), FALSE); |
| 1783 gtk_widget_show(tree_v); | 1779 gtk_widget_show(tree_v); |
| 1784 /* icons */ | 1780 /* icons */ |
| 1781 /* XXX: to be used at a later date | |
| 1785 cell = gtk_cell_renderer_pixbuf_new (); | 1782 cell = gtk_cell_renderer_pixbuf_new (); |
| 1786 column = gtk_tree_view_column_new_with_attributes ("icons", cell, "pixbuf", 0, NULL); | 1783 column = gtk_tree_view_column_new_with_attributes ("icons", cell, "pixbuf", 0, NULL); |
| 1784 */ | |
| 1787 | 1785 |
| 1788 /* text */ | 1786 /* text */ |
| 1789 cell = gtk_cell_renderer_text_new (); | 1787 cell = gtk_cell_renderer_text_new (); |
| 1790 column = gtk_tree_view_column_new_with_attributes ("text", cell, "text", 1, NULL); | 1788 column = gtk_tree_view_column_new_with_attributes ("text", cell, "text", 1, NULL); |
| 1791 | 1789 |
