[network-manager-openswan] ui: port to GtkBuilder
- From: Dan Williams <dcbw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-openswan] ui: port to GtkBuilder
- Date: Thu, 21 Apr 2011 18:58:39 +0000 (UTC)
commit c4fb5e6404c24ebfcf48cd024ec7c1ee760cf503
Author: Dan Williams <dcbw redhat com>
Date: Thu Apr 21 14:00:07 2011 -0500
ui: port to GtkBuilder
Glade no longer required.
auth-dialog/Makefile.am | 1 -
configure.ac | 4 -
po/POTFILES.in | 2 +-
properties/Makefile.am | 12 +-
...openswan-dialog.glade => nm-openswan-dialog.ui} | 201 +++++++++++++-------
properties/nm-openswan.c | 94 +++++-----
6 files changed, 181 insertions(+), 133 deletions(-)
---
diff --git a/auth-dialog/Makefile.am b/auth-dialog/Makefile.am
index 5e0bc8c..3652a27 100644
--- a/auth-dialog/Makefile.am
+++ b/auth-dialog/Makefile.am
@@ -8,7 +8,6 @@ nm_openswan_auth_dialog_CPPFLAGS = \
$(GTK_CFLAGS) \
$(GNOMEKEYRING_CFLAGS) \
-DICONDIR=\""$(datadir)/pixmaps"\" \
- -DGLADEDIR=\""$(gladedir)"\" \
-DBINDIR=\""$(bindir)"\" \
-DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
diff --git a/configure.ac b/configure.ac
index fa18bae..09522d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -70,10 +70,6 @@ if test x"$with_gnome" != xno; then
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
- PKG_CHECK_MODULES(GLADE, libglade-2.0)
- AC_SUBST(GLADE_CFLAGS)
- AC_SUBST(GLADE_LIBS)
-
PKG_CHECK_MODULES(GNOMEKEYRING, gnome-keyring-1)
AC_SUBST(GNOMEKEYRING_CFLAGS)
AC_SUBST(GNOMEKEYRING_LIBS)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 73ecc39..ab7963f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,7 +4,7 @@ auth-dialog/gnome-two-password-dialog.c
auth-dialog/main.c
nm-openswan.desktop.in
properties/nm-openswan.c
-properties/nm-openswan-dialog.glade
+[type: gettext/glade]properties/nm-openswan-dialog.ui
src/nm-openswan-service.c
diff --git a/properties/Makefile.am b/properties/Makefile.am
index b5b3e73..e2c67f0 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -7,17 +7,16 @@ libnm_openswan_properties_la_SOURCES = \
nm-openswan.c \
nm-openswan.h
-gladedir = $(datadir)/gnome-vpn-properties/openswan
-glade_DATA = nm-openswan-dialog.glade
+uidir = $(datadir)/gnome-vpn-properties/openswan
+ui_DATA = nm-openswan-dialog.ui
libnm_openswan_properties_la_CPPFLAGS = \
- $(GLADE_CFLAGS) \
$(GTK_CFLAGS) \
$(GCONF_CFLAGS) \
$(GNOMEKEYRING_CFLAGS) \
$(NM_CFLAGS) \
-DICONDIR=\""$(datadir)/pixmaps"\" \
- -DGLADEDIR=\""$(gladedir)"\" \
+ -DUIDIR=\""$(uidir)"\" \
-DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
-DGNOME_DISABLE_DEPRECATED \
@@ -25,7 +24,6 @@ libnm_openswan_properties_la_CPPFLAGS = \
-DVERSION=\"$(VERSION)\"
libnm_openswan_properties_la_LIBADD = \
- $(GLADE_LIBS) \
$(GTK_LIBS) \
$(GCONF_LIBS) \
$(NM_LIBS) \
@@ -35,6 +33,6 @@ libnm_openswan_properties_la_LIBADD = \
libnm_openswan_properties_la_LDFLAGS = \
-avoid-version
-CLEANFILES = *.bak *.gladep *~
+CLEANFILES = *.bak *~
-EXTRA_DIST = $(glade_DATA)
+EXTRA_DIST = $(ui_DATA)
diff --git a/properties/nm-openswan-dialog.glade b/properties/nm-openswan-dialog.ui
similarity index 72%
rename from properties/nm-openswan-dialog.glade
rename to properties/nm-openswan-dialog.ui
index 3b0d70e..96758cb 100644
--- a/properties/nm-openswan-dialog.glade
+++ b/properties/nm-openswan-dialog.ui
@@ -1,25 +1,50 @@
-<?xml version="1.0"?>
-<glade-interface>
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
<!-- interface-requires gtk+ 2.6 -->
- <!-- interface-naming-policy toplevel-contextual -->
- <widget class="GtkWindow" id="openswan-widget">
+ <object class="GtkListStore" id="model1">
+ <columns>
+ <!-- column-name gchararray -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes"> </col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="model2">
+ <columns>
+ <!-- column-name gchararray -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes"> </col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkWindow" id="openswan-widget">
+ <property name="can_focus">False</property>
<property name="title" translatable="yes">window1</property>
<child>
- <widget class="GtkVBox" id="openswan-vbox">
+ <object class="GtkVBox" id="openswan-vbox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="spacing">16</property>
<child>
- <widget class="GtkVBox" id="vbox8">
+ <object class="GtkVBox" id="vbox8">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label22">
+ <object class="GtkLabel" id="label22">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes"><b>General</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -27,21 +52,30 @@
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment8">
+ <object class="GtkAlignment" id="alignment8">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkTable" id="table2">
+ <object class="GtkTable" id="table2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">5</property>
<property name="n_columns">3</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkComboBox" id="group_pass_type_combo">
+ <object class="GtkComboBox" id="group_pass_type_combo">
<property name="visible">True</property>
- <property name="items" translatable="yes"> </property>
- </widget>
+ <property name="can_focus">False</property>
+ <property name="model">model1</property>
+ <child>
+ <object class="GtkCellRendererText" id="renderer1"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
@@ -50,10 +84,17 @@
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="user_pass_type_combo">
+ <object class="GtkComboBox" id="user_pass_type_combo">
<property name="visible">True</property>
- <property name="items" translatable="yes"> </property>
- </widget>
+ <property name="can_focus">False</property>
+ <property name="model">model2</property>
+ <child>
+ <object class="GtkCellRendererText" id="renderer2"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
@@ -62,13 +103,15 @@
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="show_passwords_checkbutton">
+ <object class="GtkCheckButton" id="show_passwords_checkbutton">
<property name="label" translatable="yes">Show passwords</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="xalign">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -77,11 +120,11 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="group_password_entry">
+ <object class="GtkEntry" id="group_password_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="visibility">False</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -91,13 +134,14 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label4">
+ <object class="GtkLabel" id="label4">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Gro_up password:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">group_entry</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
@@ -106,26 +150,28 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label23">
+ <object class="GtkLabel" id="label23">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Gateway:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">gateway_entry</property>
- </widget>
+ </object>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label24">
+ <object class="GtkLabel" id="label24">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">G_roup name:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">group_entry</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
@@ -134,10 +180,10 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="gateway_entry">
+ <object class="GtkEntry" id="gateway_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -145,10 +191,10 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="group_entry">
+ <object class="GtkEntry" id="group_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -158,13 +204,14 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label3">
+ <object class="GtkLabel" id="label3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_User password:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">group_entry</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
@@ -173,11 +220,11 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="user_password_entry">
+ <object class="GtkEntry" id="user_password_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="visibility">False</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -198,30 +245,35 @@
<child>
<placeholder/>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox11">
+ <object class="GtkVBox" id="vbox11">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label25">
+ <object class="GtkLabel" id="label25">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes"><b>Optional</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -229,36 +281,40 @@
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment9">
+ <object class="GtkAlignment" id="alignment9">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkEventBox" id="eventbox1">
+ <object class="GtkEventBox" id="eventbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
- <widget class="GtkTable" id="table3">
+ <object class="GtkTable" id="table3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">4</property>
<property name="n_columns">2</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkLabel" id="label26">
+ <object class="GtkLabel" id="label26">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">User name:</property>
- </widget>
+ </object>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="user_entry">
+ <object class="GtkEntry" id="user_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
- </widget>
+ <property name="invisible_char">â??</property>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -266,11 +322,12 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label27">
+ <object class="GtkLabel" id="label27">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Phase1 Algorithms:</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
@@ -279,11 +336,11 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="phase1_entry">
+ <object class="GtkEntry" id="phase1_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
- </widget>
+ <property name="invisible_char">â??</property>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -293,11 +350,12 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label1">
+ <object class="GtkLabel" id="label1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Phase2 Algorithms:</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
@@ -306,11 +364,11 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="phase2_entry">
+ <object class="GtkEntry" id="phase2_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
- </widget>
+ <property name="invisible_char">â??</property>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -320,11 +378,12 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label2">
+ <object class="GtkLabel" id="label2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Domain:</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
@@ -333,11 +392,11 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="domain_entry">
+ <object class="GtkEntry" id="domain_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
- </widget>
+ <property name="invisible_char">â??</property>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -346,23 +405,25 @@
<property name="y_options"></property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
-</glade-interface>
+ </object>
+</interface>
diff --git a/properties/nm-openswan.c b/properties/nm-openswan.c
index 45156fa..97fc6b0 100644
--- a/properties/nm-openswan.c
+++ b/properties/nm-openswan.c
@@ -33,7 +33,6 @@
#include <glib/gi18n-lib.h>
#include <string.h>
#include <gtk/gtk.h>
-#include <glade/glade.h>
#include <gnome-keyring.h>
#include <gnome-keyring-memory.h>
@@ -79,7 +78,7 @@ G_DEFINE_TYPE_EXTENDED (OpenswanPluginUiWidget, openswan_plugin_ui_widget, G_TYP
#define OPENSWAN_PLUGIN_UI_WIDGET_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), OPENSWAN_TYPE_PLUGIN_UI_WIDGET, OpenswanPluginUiWidgetPrivate))
typedef struct {
- GladeXML *xml;
+ GtkBuilder *builder;
GtkWidget *widget;
GtkSizeGroup *group;
gint orig_dpd_timeout;
@@ -132,7 +131,7 @@ check_validity (OpenswanPluginUiWidget *self, GError **error)
GtkWidget *widget;
char *str;
- widget = glade_xml_get_widget (priv->xml, "gateway_entry");
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "gateway_entry"));
str = (char *) gtk_entry_get_text (GTK_ENTRY (widget));
if (!str || !strlen (str) || strstr (str, " ") || strstr (str, "\t")) {
g_set_error (error,
@@ -142,7 +141,7 @@ check_validity (OpenswanPluginUiWidget *self, GError **error)
return FALSE;
}
- widget = glade_xml_get_widget (priv->xml, "group_entry");
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "group_entry"));
str = (char *) gtk_entry_get_text (GTK_ENTRY (widget));
if (!str || !strlen (str)) {
g_set_error (error,
@@ -207,7 +206,7 @@ fill_vpn_passwords (OpenswanPluginUiWidget *self, NMConnection *connection)
}
/* User password */
- widget = glade_xml_get_widget (priv->xml, "user_password_entry");
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "user_password_entry"));
if (!widget)
goto out;
if (password)
@@ -216,7 +215,7 @@ fill_vpn_passwords (OpenswanPluginUiWidget *self, NMConnection *connection)
g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (stuff_changed_cb), self);
/* Group password */
- widget = glade_xml_get_widget (priv->xml, "group_password_entry");
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "group_password_entry"));
if (!widget)
goto out;
if (group_password)
@@ -242,11 +241,11 @@ show_toggled_cb (GtkCheckButton *button, OpenswanPluginUiWidget *self)
visible = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
- widget = glade_xml_get_widget (priv->xml, "user_password_entry");
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "user_password_entry"));
g_assert (widget);
gtk_entry_set_visibility (GTK_ENTRY (widget), visible);
- widget = glade_xml_get_widget (priv->xml, "group_password_entry");
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "group_password_entry"));
g_assert (widget);
gtk_entry_set_visibility (GTK_ENTRY (widget), visible);
}
@@ -261,18 +260,18 @@ pw_type_changed_helper (OpenswanPluginUiWidget *self, GtkWidget *combo)
/* If the user chose "Not required", desensitize and clear the correct
* password entry.
*/
- widget = glade_xml_get_widget (priv->xml, "user_pass_type_combo");
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "user_pass_type_combo"));
if (combo == widget)
entry = "user_password_entry";
else {
- widget = glade_xml_get_widget (priv->xml, "group_pass_type_combo");
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "group_pass_type_combo"));
if (combo == widget)
entry = "group_password_entry";
}
if (!entry)
return;
- widget = glade_xml_get_widget (priv->xml, entry);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, entry));
g_assert (widget);
switch (gtk_combo_box_get_active (GTK_COMBO_BOX (combo))) {
@@ -328,7 +327,7 @@ init_one_pw_combo (OpenswanPluginUiWidget *self,
/* If there's already a password and the password type can't be found in
* the VPN settings, default to saving it. Otherwise, always ask for it.
*/
- widget = glade_xml_get_widget (priv->xml, entry_name);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, entry_name));
if (widget) {
const char *tmp;
@@ -364,7 +363,7 @@ init_one_pw_combo (OpenswanPluginUiWidget *self,
active = 2;
}
- widget = glade_xml_get_widget (priv->xml, combo_name);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, combo_name));
g_assert (widget);
gtk_combo_box_set_model (GTK_COMBO_BOX (widget), GTK_TREE_MODEL (store));
g_object_unref (store);
@@ -386,7 +385,7 @@ init_plugin_ui (OpenswanPluginUiWidget *self, NMConnection *connection, GError *
priv->group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
- widget = glade_xml_get_widget (priv->xml, "gateway_entry");
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "gateway_entry"));
g_return_val_if_fail (widget != NULL, FALSE);
gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget));
if (s_vpn) {
@@ -396,7 +395,7 @@ init_plugin_ui (OpenswanPluginUiWidget *self, NMConnection *connection, GError *
}
g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (stuff_changed_cb), self);
- widget = glade_xml_get_widget (priv->xml, "group_entry");
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "group_entry"));
g_return_val_if_fail (widget != NULL, FALSE);
gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget));
if (s_vpn) {
@@ -416,7 +415,7 @@ init_plugin_ui (OpenswanPluginUiWidget *self, NMConnection *connection, GError *
init_one_pw_combo (self, s_vpn, "group_pass_type_combo",
NM_OPENSWAN_PSK_INPUT_MODES, "group_password_entry");
- widget = glade_xml_get_widget (priv->xml, "user_entry");
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "user_entry"));
g_return_val_if_fail (widget != NULL, FALSE);
gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget));
if (s_vpn) {
@@ -427,7 +426,7 @@ init_plugin_ui (OpenswanPluginUiWidget *self, NMConnection *connection, GError *
g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (stuff_changed_cb), self);
/* Phase 1 Algorithms: IKE*/
- widget = glade_xml_get_widget (priv->xml, "phase1_entry");
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "phase1_entry"));
g_return_val_if_fail (widget != NULL, FALSE);
gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget));
if (s_vpn) {
@@ -438,7 +437,7 @@ init_plugin_ui (OpenswanPluginUiWidget *self, NMConnection *connection, GError *
g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (stuff_changed_cb), self);
/* Phase 2 Algorithms: ESP*/
- widget = glade_xml_get_widget (priv->xml, "phase2_entry");
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "phase2_entry"));
g_return_val_if_fail (widget != NULL, FALSE);
gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget));
if (s_vpn) {
@@ -448,7 +447,7 @@ init_plugin_ui (OpenswanPluginUiWidget *self, NMConnection *connection, GError *
}
g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (stuff_changed_cb), self);
- widget = glade_xml_get_widget (priv->xml, "domain_entry");
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "domain_entry"));
g_return_val_if_fail (widget != NULL, FALSE);
gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget));
if (s_vpn) {
@@ -458,7 +457,7 @@ init_plugin_ui (OpenswanPluginUiWidget *self, NMConnection *connection, GError *
}
g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (stuff_changed_cb), self);
- /*widget = glade_xml_get_widget (priv->xml, "disable_dpd_checkbutton");
+ /*widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "disable_dpd_checkbutton"));
g_return_val_if_fail (widget != NULL, FALSE);
if (s_vpn) {
value = nm_setting_vpn_get_data_item (s_vpn, NM_OPENSWAN_DPDTIMEOUT);
@@ -476,7 +475,7 @@ init_plugin_ui (OpenswanPluginUiWidget *self, NMConnection *connection, GError *
}
g_signal_connect (G_OBJECT (widget), "toggled", G_CALLBACK (stuff_changed_cb), self);*/
- widget = glade_xml_get_widget (priv->xml, "show_passwords_checkbutton");
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "show_passwords_checkbutton"));
g_return_val_if_fail (widget != NULL, FALSE);
g_signal_connect (G_OBJECT (widget), "toggled",
(GCallback) show_toggled_cb,
@@ -495,14 +494,14 @@ get_widget (NMVpnPluginUiWidgetInterface *iface)
}
static guint32
-handle_one_pw_type (NMSettingVPN *s_vpn, GladeXML *xml, const char *name, const char *key)
+handle_one_pw_type (NMSettingVPN *s_vpn, GtkBuilder *builder, const char *name, const char *key)
{
NMSettingSecretFlags flags = NM_SETTING_SECRET_FLAG_NONE;
GtkWidget *widget;
guint32 pw_type;
const char *data_val = NULL;
- widget = glade_xml_get_widget (xml, name);
+ widget = GTK_WIDGET (gtk_builder_get_object (builder, name));
nm_setting_get_secret_flags (NM_SETTING (s_vpn), key, &flags, NULL);
flags &= ~(NM_SETTING_SECRET_FLAG_NOT_SAVED | NM_SETTING_SECRET_FLAG_NOT_REQUIRED);
@@ -548,42 +547,42 @@ update_connection (NMVpnPluginUiWidgetInterface *iface,
g_object_set (s_vpn, NM_SETTING_VPN_SERVICE_TYPE, NM_DBUS_SERVICE_OPENSWAN, NULL);
/* Gateway */
- widget = glade_xml_get_widget (priv->xml, "gateway_entry");
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "gateway_entry"));
str = (char *) gtk_entry_get_text (GTK_ENTRY (widget));
if (str && strlen (str))
nm_setting_vpn_add_data_item (s_vpn, NM_OPENSWAN_RIGHT, str);
/* Group name */
- widget = glade_xml_get_widget (priv->xml, "group_entry");
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "group_entry"));
str = (char *) gtk_entry_get_text (GTK_ENTRY (widget));
if (str && strlen (str))
nm_setting_vpn_add_data_item (s_vpn, NM_OPENSWAN_LEFTID, str);
/* User name*/
- widget = glade_xml_get_widget (priv->xml, "user_entry");
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "user_entry"));
str = (char *) gtk_entry_get_text (GTK_ENTRY (widget));
if (str && strlen (str))
nm_setting_vpn_add_data_item (s_vpn, NM_OPENSWAN_LEFTXAUTHUSER, str);
/* Phase 1 Algorithms: ike */
- widget = glade_xml_get_widget (priv->xml, "phase1_entry");
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "phase1_entry"));
str = (char *) gtk_entry_get_text (GTK_ENTRY (widget));
if (str && strlen (str))
nm_setting_vpn_add_data_item (s_vpn, NM_OPENSWAN_IKE, str);
/* Phase 2 Algorithms: esp */
- widget = glade_xml_get_widget (priv->xml, "phase2_entry");
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "phase2_entry"));
str = (char *) gtk_entry_get_text (GTK_ENTRY (widget));
if (str && strlen (str))
nm_setting_vpn_add_data_item (s_vpn, NM_OPENSWAN_ESP, str);
/* Domain entry */
- widget = glade_xml_get_widget (priv->xml, "domain_entry");
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "domain_entry"));
str = (char *) gtk_entry_get_text (GTK_ENTRY (widget));
if (str && strlen (str))
nm_setting_vpn_add_data_item (s_vpn, NM_OPENSWAN_DOMAIN, str);
- //widget = glade_xml_get_widget (priv->xml, "disable_dpd_checkbutton");
+ //widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "disable_dpd_checkbutton"));
//if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) {
// nm_setting_vpn_add_data_item (s_vpn, NM_OPENSWAN_DPDTIMEOUT, "0");
//} else {
@@ -598,17 +597,17 @@ update_connection (NMVpnPluginUiWidgetInterface *iface,
// }
//}
- upw_type = handle_one_pw_type (s_vpn, priv->xml, "user_pass_type_combo", NM_OPENSWAN_XAUTH_PASSWORD_INPUT_MODES);
- gpw_type = handle_one_pw_type (s_vpn, priv->xml, "group_pass_type_combo", NM_OPENSWAN_PSK_INPUT_MODES);
+ upw_type = handle_one_pw_type (s_vpn, priv->builder, "user_pass_type_combo", NM_OPENSWAN_XAUTH_PASSWORD_INPUT_MODES);
+ gpw_type = handle_one_pw_type (s_vpn, priv->builder, "group_pass_type_combo", NM_OPENSWAN_PSK_INPUT_MODES);
/* User password */
- widget = glade_xml_get_widget (priv->xml, "user_password_entry");
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "user_password_entry"));
str = (char *) gtk_entry_get_text (GTK_ENTRY (widget));
if (str && strlen (str) && (upw_type != PW_TYPE_UNUSED))
nm_setting_vpn_add_secret (s_vpn, NM_OPENSWAN_XAUTH_PASSWORD, str);
/* Group password */
- widget = glade_xml_get_widget (priv->xml, "group_password_entry");
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "group_password_entry"));
str = (char *) gtk_entry_get_text (GTK_ENTRY (widget));
if (str && strlen (str) && (gpw_type != PW_TYPE_UNUSED))
nm_setting_vpn_add_secret (s_vpn, NM_OPENSWAN_PSK_VALUE, str);
@@ -618,7 +617,7 @@ update_connection (NMVpnPluginUiWidgetInterface *iface,
}
static void
-save_one_password (GladeXML *xml,
+save_one_password (GtkBuilder *builder,
const char *keyring_tag,
const char *uuid,
const char *id,
@@ -631,10 +630,10 @@ save_one_password (GladeXML *xml,
const char *password;
gboolean saved = FALSE;
- widget = glade_xml_get_widget (xml, combo);
+ widget = GTK_WIDGET (gtk_builder_get_object (builder, combo));
g_assert (widget);
if (gtk_combo_box_get_active (GTK_COMBO_BOX (widget)) == PW_TYPE_SAVE) {
- widget = glade_xml_get_widget (xml, entry);
+ widget = GTK_WIDGET (gtk_builder_get_object (builder, entry));
g_assert (widget);
password = gtk_entry_get_text (GTK_ENTRY (widget));
if (password && strlen (password)) {
@@ -677,14 +676,14 @@ save_secrets (NMVpnPluginUiWidgetInterface *iface,
if (nm_setting_get_secret_flags (NM_SETTING (s_vpn), NM_OPENSWAN_XAUTH_PASSWORD, &secret_flags, NULL)) {
if (secret_flags & NM_SETTING_SECRET_FLAG_AGENT_OWNED) {
- save_one_password (priv->xml, OPENSWAN_USER_PASSWORD, uuid, id,
+ save_one_password (priv->builder, OPENSWAN_USER_PASSWORD, uuid, id,
"user_password_entry", "user_pass_type_combo", "user password");
}
}
if (nm_setting_get_secret_flags (NM_SETTING (s_vpn), NM_OPENSWAN_PSK_VALUE, &secret_flags, NULL)) {
if (secret_flags & NM_SETTING_SECRET_FLAG_AGENT_OWNED) {
- save_one_password (priv->xml, OPENSWAN_GROUP_PASSWORD, uuid, id,
+ save_one_password (priv->builder, OPENSWAN_GROUP_PASSWORD, uuid, id,
"group_password_entry", "group_pass_type_combo", "group password");
}
}
@@ -697,7 +696,6 @@ nm_vpn_plugin_ui_widget_interface_new (NMConnection *connection, GError **error)
{
NMVpnPluginUiWidgetInterface *object;
OpenswanPluginUiWidgetPrivate *priv;
- char *glade_file;
if (error)
g_return_val_if_fail (*error == NULL, NULL);
@@ -710,18 +708,14 @@ nm_vpn_plugin_ui_widget_interface_new (NMConnection *connection, GError **error)
priv = OPENSWAN_PLUGIN_UI_WIDGET_GET_PRIVATE (object);
- glade_file = g_strdup_printf ("%s/%s", GLADEDIR, "nm-openswan-dialog.glade");
- priv->xml = glade_xml_new (glade_file, "openswan-vbox", GETTEXT_PACKAGE);
- if (priv->xml == NULL) {
- g_set_error (error, OPENSWAN_PLUGIN_UI_ERROR, 0,
- "could not load required resources at %s", glade_file);
- g_free (glade_file);
+ priv->builder = gtk_builder_new ();
+ g_assert (priv->builder);
+ if (gtk_builder_add_from_file (priv->builder, UIDIR "/nm-openswan-dialog.ui", error) == 0) {
g_object_unref (object);
return NULL;
}
- g_free (glade_file);
- priv->widget = glade_xml_get_widget (priv->xml, "openswan-vbox");
+ priv->widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "openswan-vbox"));
if (!priv->widget) {
g_set_error (error, OPENSWAN_PLUGIN_UI_ERROR, 0, "could not load UI widget");
g_object_unref (object);
@@ -749,8 +743,8 @@ dispose (GObject *object)
if (priv->widget)
g_object_unref (priv->widget);
- if (priv->xml)
- g_object_unref (priv->xml);
+ if (priv->builder)
+ g_object_unref (priv->builder);
G_OBJECT_CLASS (openswan_plugin_ui_widget_parent_class)->dispose (object);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
