[gnome-control-center] network: Move non-shared code into the one module that uses it
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] network: Move non-shared code into the one module that uses it
- Date: Tue, 22 Oct 2019 20:17:17 +0000 (UTC)
commit d549c9e7bdbfcbc256b74fa2257ee509de77cb61
Author: Robert Ancell <robert ancell canonical com>
Date: Fri Oct 18 10:25:25 2019 +1300
network: Move non-shared code into the one module that uses it
panels/network/connection-editor/ce-page-ethernet.c | 19 +++++++++++++++++++
panels/network/connection-editor/ce-page.c | 19 -------------------
panels/network/connection-editor/ce-page.h | 2 --
3 files changed, 19 insertions(+), 21 deletions(-)
---
diff --git a/panels/network/connection-editor/ce-page-ethernet.c
b/panels/network/connection-editor/ce-page-ethernet.c
index 60b68cb4e..dd57fc30b 100644
--- a/panels/network/connection-editor/ce-page-ethernet.c
+++ b/panels/network/connection-editor/ce-page-ethernet.c
@@ -42,6 +42,25 @@ mtu_changed (GtkSpinButton *mtu, CEPageEthernet *page)
gtk_widget_show (page->mtu_label);
}
+static gint
+ce_spin_output_with_default (GtkSpinButton *spin, gpointer user_data)
+{
+ gint defvalue = GPOINTER_TO_INT (user_data);
+ gint val;
+ g_autofree gchar *buf = NULL;
+
+ val = gtk_spin_button_get_value_as_int (spin);
+ if (val == defvalue)
+ buf = g_strdup (_("automatic"));
+ else
+ buf = g_strdup_printf ("%d", val);
+
+ if (strcmp (buf, gtk_entry_get_text (GTK_ENTRY (spin))))
+ gtk_entry_set_text (GTK_ENTRY (spin), buf);
+
+ return TRUE;
+}
+
static void
connect_ethernet_page (CEPageEthernet *page)
{
diff --git a/panels/network/connection-editor/ce-page.c b/panels/network/connection-editor/ce-page.c
index adec1ae10..434c22eda 100644
--- a/panels/network/connection-editor/ce-page.c
+++ b/panels/network/connection-editor/ce-page.c
@@ -518,25 +518,6 @@ ce_get_property_default (NMSetting *setting, const gchar *property_name)
return 0;
}
-gint
-ce_spin_output_with_default (GtkSpinButton *spin, gpointer user_data)
-{
- gint defvalue = GPOINTER_TO_INT (user_data);
- gint val;
- g_autofree gchar *buf = NULL;
-
- val = gtk_spin_button_get_value_as_int (spin);
- if (val == defvalue)
- buf = g_strdup (_("automatic"));
- else
- buf = g_strdup_printf ("%d", val);
-
- if (strcmp (buf, gtk_entry_get_text (GTK_ENTRY (spin))))
- gtk_entry_set_text (GTK_ENTRY (spin), buf);
-
- return TRUE;
-}
-
gchar *
ce_page_get_next_available_name (const GPtrArray *connections,
NameFormat format,
diff --git a/panels/network/connection-editor/ce-page.h b/panels/network/connection-editor/ce-page.h
index d7df04dc0..3d721432a 100644
--- a/panels/network/connection-editor/ce-page.h
+++ b/panels/network/connection-editor/ce-page.h
@@ -94,8 +94,6 @@ void ce_page_setup_cloned_mac_combo (GtkComboBoxText *combo,
const char *current);
gint ce_get_property_default (NMSetting *setting,
const gchar *property_name);
-gint ce_spin_output_with_default (GtkSpinButton *spin,
- gpointer user_data);
gboolean ce_page_address_is_valid (const gchar *addr);
gchar *ce_page_trim_address (const gchar *addr);
char *ce_page_cloned_mac_get (GtkComboBoxText *combo);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]