diff -u gnome-control-center-2.28.1/debian/control gnome-control-center-2.28.1/debian/control --- gnome-control-center-2.28.1/debian/control +++ gnome-control-center-2.28.1/debian/control @@ -1,7 +1,7 @@ Source: gnome-control-center Section: gnome Priority: optional -Maintainer: Ubuntu Desktop Team +Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Marco Cabizza Uploaders: Debian GNOME Maintainers Standards-Version: 3.8.1 diff -u gnome-control-center-2.28.1/debian/control.in gnome-control-center-2.28.1/debian/control.in --- gnome-control-center-2.28.1/debian/control.in +++ gnome-control-center-2.28.1/debian/control.in @@ -1,7 +1,7 @@ Source: gnome-control-center Section: gnome Priority: optional -Maintainer: Ubuntu Desktop Team +Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Marco Cabizza Uploaders: @GNOME_TEAM@ Standards-Version: 3.8.1 diff -u gnome-control-center-2.28.1/debian/changelog gnome-control-center-2.28.1/debian/changelog --- gnome-control-center-2.28.1/debian/changelog +++ gnome-control-center-2.28.1/debian/changelog @@ -1,3 +1,9 @@ +gnome-control-center (1:2.28.1-0ubuntu2) karmic; urgency=low + + * Fix text entries not getting changed while you type an http host if "Use the same proxy" check button is checked. + + -- Henrique Rocha Fri, 30 Oct 2009 17:17:47 +0000 + gnome-control-center (1:2.28.1-0ubuntu1) karmic; urgency=low * New upstream release: (LP: #455971) only in patch2: unchanged: --- gnome-control-center-2.28.1.orig/capplets/network/gnome-network-properties.c +++ gnome-control-center-2.28.1/capplets/network/gnome-network-properties.c @@ -1013,6 +1013,48 @@ g_object_unref (client); } +static void +http_port_spinbutton_changed(GtkSpinButton *spinbutton, + GtkBuilder *builder) +{ + GtkCheckButton *cb = + GTK_CHECK_BUTTON(_gtk_builder_get_widget(builder, + "same_proxy_checkbutton")); + gdouble value = gtk_spin_button_get_value(spinbutton); + + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cb))) { + GtkSpinButton *sb; + sb = GTK_SPIN_BUTTON(_gtk_builder_get_widget(builder, + "secure_port_spinbutton")); + gtk_spin_button_set_value(sb, value); + sb = GTK_SPIN_BUTTON(_gtk_builder_get_widget(builder, + "ftp_port_spinbutton")); + gtk_spin_button_set_value(sb, value); + sb = GTK_SPIN_BUTTON(_gtk_builder_get_widget(builder, + "socks_port_spinbutton")); + gtk_spin_button_set_value(sb, value); + } +} + +static void +http_host_entry_changed(GtkEntry *entry, + GtkBuilder *builder) +{ + GtkCheckButton *cb = + GTK_CHECK_BUTTON(_gtk_builder_get_widget(builder, + "same_proxy_checkbutton")); + const gchar *text = gtk_entry_get_text(entry); + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cb))) { + GtkEntry *e; + e = GTK_ENTRY(_gtk_builder_get_widget(builder, "secure_host_entry")); + gtk_entry_set_text(e, text); + e = GTK_ENTRY(_gtk_builder_get_widget(builder, "ftp_host_entry")); + gtk_entry_set_text(e, text); + e = GTK_ENTRY(_gtk_builder_get_widget(builder, "socks_host_entry")); + gtk_entry_set_text(e, text); + } +} + static gchar * get_hostname_from_uri (const gchar *uri) { @@ -1198,6 +1240,15 @@ G_CALLBACK (cb_http_details_button_clicked), _gtk_builder_get_widget (builder, "network_dialog")); + g_signal_connect (gtk_builder_get_object (builder, "http_host_entry"), + "changed", + G_CALLBACK (http_host_entry_changed), + builder); + g_signal_connect (gtk_builder_get_object (builder, "http_port_spinbutton"), + "value-changed", + G_CALLBACK (http_port_spinbutton_changed), + builder); + /* Secure */ port_value = gconf_client_get_int (client, SECURE_PROXY_PORT_KEY, NULL); gtk_spin_button_set_value (GTK_SPIN_BUTTON (gtk_builder_get_object (builder, "secure_port_spinbutton")), (gdouble) port_value);