Raphael Manfredi wrote:
Quoting Russell Francis <[EMAIL PROTECTED]> from ml.softs.gtk-gnutella.devel:
:I posted a patch attached to bug# 862487 which adds these features to
:the Gtk2 interface. If it looks good to you, it would be nice to have
:them in the 0.93.1 release.
Thanks, integrated.
However, there is a problem: the RX buffers are configured in an "expert"
frame, called "frame_expert_rx_buffers" in GTK1. Could you add it to
GTK2 and remove the #ifdef USE_GTK1 in settings_gui.c that hides it when
not in expert mode?
Opps, sorry about that, attached is a patch which will fix that.
Thanks again,
Russ
Index: gtk2-gnutella.glade
===================================================================
RCS file: /cvsroot/gtk-gnutella/gtk-gnutella-current/gtk2-gnutella.glade,v
retrieving revision 1.79
diff -u -r1.79 gtk2-gnutella.glade
--- gtk2-gnutella.glade 20 Dec 2003 20:27:04 -0000 1.79
+++ gtk2-gnutella.glade 24 Dec 2003 14:04:10 -0000
@@ -7625,7 +7625,7 @@
</child>
<child>
- <widget class="GtkFrame" id="frame89">
+ <widget class="GtkFrame" id="frame_expert_rx_buffers">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="label_yalign">0.5</property>
Index: src/interface-glade2.c
===================================================================
RCS file: /cvsroot/gtk-gnutella/gtk-gnutella-current/src/interface-glade2.c,v
retrieving revision 1.82
diff -u -r1.82 interface-glade2.c
--- src/interface-glade2.c 20 Dec 2003 20:27:04 -0000 1.82
+++ src/interface-glade2.c 24 Dec 2003 14:04:26 -0000
@@ -4272,7 +4272,7 @@
GtkWidget *label156;
GtkWidget *hseparator8;
GtkWidget *label291;
- GtkWidget *frame89;
+ GtkWidget *frame_expert_rx_buffers;
GtkWidget *table77;
GtkWidget *label_kbytes_1;
GtkWidget *label_kbytes;
@@ -4686,15 +4686,15 @@
gtk_frame_set_label_widget (GTK_FRAME (frame12), label291);
gtk_label_set_justify (GTK_LABEL (label291), GTK_JUSTIFY_LEFT);
- frame89 = gtk_frame_new (NULL);
- gtk_widget_set_name (frame89, "frame89");
- gtk_widget_show (frame89);
- gtk_box_pack_start (GTK_BOX (vbox29), frame89, FALSE, TRUE, 2);
+ frame_expert_rx_buffers = gtk_frame_new (NULL);
+ gtk_widget_set_name (frame_expert_rx_buffers, "frame_expert_rx_buffers");
+ gtk_widget_show (frame_expert_rx_buffers);
+ gtk_box_pack_start (GTK_BOX (vbox29), frame_expert_rx_buffers, FALSE, TRUE, 2);
table77 = gtk_table_new (2, 3, FALSE);
gtk_widget_set_name (table77, "table77");
gtk_widget_show (table77);
- gtk_container_add (GTK_CONTAINER (frame89), table77);
+ gtk_container_add (GTK_CONTAINER (frame_expert_rx_buffers), table77);
label_kbytes_1 = gtk_label_new (_("Kbytes"));
gtk_widget_set_name (label_kbytes_1, "label_kbytes_1");
@@ -4753,7 +4753,7 @@
label736 = gtk_label_new (_("Socket receive buffer size"));
gtk_widget_set_name (label736, "label736");
gtk_widget_show (label736);
- gtk_frame_set_label_widget (GTK_FRAME (frame89), label736);
+ gtk_frame_set_label_widget (GTK_FRAME (frame_expert_rx_buffers), label736);
gtk_label_set_justify (GTK_LABEL (label736), GTK_JUSTIFY_LEFT);
gtk_label_set_mnemonic_widget (GTK_LABEL (label156), spinbutton_config_speed);
@@ -4818,7 +4818,7 @@
GLADE_HOOKUP_OBJECT (main_window_config_bwc_tab, label156, "label156");
GLADE_HOOKUP_OBJECT (main_window_config_bwc_tab, hseparator8, "hseparator8");
GLADE_HOOKUP_OBJECT (main_window_config_bwc_tab, label291, "label291");
- GLADE_HOOKUP_OBJECT (main_window_config_bwc_tab, frame89, "frame89");
+ GLADE_HOOKUP_OBJECT (main_window_config_bwc_tab, frame_expert_rx_buffers,
"frame_expert_rx_buffers");
GLADE_HOOKUP_OBJECT (main_window_config_bwc_tab, table77, "table77");
GLADE_HOOKUP_OBJECT (main_window_config_bwc_tab, label_kbytes_1, "label_kbytes_1");
GLADE_HOOKUP_OBJECT (main_window_config_bwc_tab, label_kbytes, "label_kbytes");
Index: src/settings_gui.c
===================================================================
RCS file: /cvsroot/gtk-gnutella/gtk-gnutella-current/src/settings_gui.c,v
retrieving revision 1.139
diff -u -r1.139 settings_gui.c
--- src/settings_gui.c 24 Dec 2003 08:20:57 -0000 1.139
+++ src/settings_gui.c 24 Dec 2003 14:04:29 -0000
@@ -3706,9 +3706,7 @@
"frame_expert_ul_timeout",
"frame_expert_dl_source_quality",
"frame_expert_unmapped",
-#ifdef USE_GTK1
"frame_expert_rx_buffers",
-#endif
NULL
};
gint n;
