[vinagre] Use GtkBuilder instead of libglade. Fixes bug #580209.
- From: Jonh Wendell <jwendell src gnome org>
- To: svn-commits-list gnome org
- Subject: [vinagre] Use GtkBuilder instead of libglade. Fixes bug #580209.
- Date: Tue, 28 Jul 2009 19:15:52 +0000 (UTC)
commit 588d039a182b9ca503746f9b3fe0a79292cc12cf
Author: Leandro Mattioli <leandro mattioli gmail com>
Date: Mon Jul 27 18:20:10 2009 -0300
Use GtkBuilder instead of libglade. Fixes bug #580209.
configure.ac | 3 -
data/Makefile.am | 4 +-
data/{vinagre.glade => vinagre.ui} | 373 ++++++++++++++++++------------------
plugins/vnc/vinagre-vnc-tab.c | 32 ++--
po/POTFILES.in | 2 +-
vinagre/vinagre-bookmarks-ui.c | 51 +++--
vinagre/vinagre-connect.c | 26 ++-
vinagre/vinagre-prefs.c | 24 ++-
vinagre/vinagre-tab.c | 1 -
vinagre/vinagre-utils.c | 10 +-
vinagre/vinagre-utils.h | 2 +-
11 files changed, 279 insertions(+), 249 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e30c312..039820e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,7 +39,6 @@ GNOME_DOC_INIT
GLIB_REQUIRED=2.17.0
GTK_REQUIRED=2.13.1
-LIBGLADE_REQUIRED=2.6.0
GCONF_REQUIRED=2.16.0
GTHREAD_REQUIRED=2.0.0
GTK_VNC_REQUIRED=0.3.8
@@ -69,7 +68,6 @@ PKG_CHECK_MODULES(VINAGRE, \
glib-2.0 >= $GLIB_REQUIRED \
gio-2.0 >= $GLIB_REQUIRED \
gtk+-2.0 >= $GTK_REQUIRED \
- libglade-2.0 >= $LIBGLADE_REQUIRED \
gconf-2.0 >= $GCONF_REQUIRED \
gthread-2.0 >= $GTHREAD_REQUIRED \
gnome-keyring-1 \
@@ -80,7 +78,6 @@ AC_SUBST(VINAGRE_LIBS)
PKG_CHECK_MODULES(VNC, \
gtk-vnc-1.0 >= $GTK_VNC_REQUIRED \
- libglade-2.0 >= $LIBGLADE_REQUIRED \
libxml-2.0 >= $XML_REQUIRED
)
AC_SUBST(VNC_CFLAGS)
diff --git a/data/Makefile.am b/data/Makefile.am
index 97b711f..d16fc3f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,7 +1,7 @@
SUBDIRS = icons pixmaps
-gladedir = $(datadir)/vinagre
-glade_DATA = vinagre.glade
+gtkbuilderdir = $(datadir)/vinagre
+gtkbuilder_DATA = vinagre.ui
man_MANS = vinagre.1
diff --git a/data/vinagre.glade b/data/vinagre.ui
similarity index 86%
rename from data/vinagre.glade
rename to data/vinagre.ui
index c5d3b24..e8639e4 100644
--- a/data/vinagre.glade
+++ b/data/vinagre.ui
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
-<glade-interface>
- <!-- interface-requires gtk+ 2.16 -->
+<interface>
+ <requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy toplevel-contextual -->
- <widget class="GtkDialog" id="connect_dialog">
+ <object class="GtkDialog" id="connect_dialog">
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">5</property>
<property name="resizable">False</property>
@@ -11,18 +11,18 @@
<property name="destroy_with_parent">True</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox1">
+ <object class="GtkVBox" id="dialog-vbox1">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkLabel" id="label1">
+ <object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes"><b>Which machine do you want to connect to?</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -31,7 +31,7 @@
</packing>
</child>
<child>
- <widget class="GtkTable" id="table1">
+ <object class="GtkTable" id="table1">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="n_rows">2</property>
@@ -39,7 +39,7 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkButton" id="find_button">
+ <object class="GtkButton" id="find_button">
<property name="label">gtk-find</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -47,7 +47,7 @@
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="use_stock">True</property>
<property name="focus_on_click">False</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">3</property>
<property name="right_attach">4</property>
@@ -58,13 +58,13 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="host_label">
+ <object class="GtkLabel" id="host_label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">_Host:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">host_entry</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -75,22 +75,21 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label2">
+ <object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label"> </property>
- </widget>
+ </object>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkComboBoxEntry" id="host_entry">
+ <object class="GtkComboBoxEntry" id="host_entry">
<property name="width_request">250</property>
<property name="visible">True</property>
- <property name="tooltip" translatable="yes" comments="Tooltip for host entry in connect dialog">host or host:display or host::port</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
@@ -100,41 +99,41 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="protocol_label">
+ <object class="GtkLabel" id="protocol_label">
<property name="visible">True</property>
<property name="label" translatable="yes">_Protocol:</property>
<property name="use_markup">True</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">protocol_combo</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox1">
+ <object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
<child>
- <widget class="GtkComboBox" id="protocol_combo">
+ <object class="GtkComboBox" id="protocol_combo">
<property name="visible">True</property>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="protocol_description_label">
+ <object class="GtkLabel" id="protocol_description_label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="xpad">5</property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">4</property>
@@ -143,20 +142,20 @@
<child>
<placeholder/>
</child>
- </widget>
+ </object>
<packing>
<property name="padding">4</property>
<property name="position">2</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label4">
+ <object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes"><b>Connection options</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -165,14 +164,14 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox2">
+ <object class="GtkHBox" id="hbox2">
<property name="visible">True</property>
<child>
- <widget class="GtkLabel" id="label3">
+ <object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label"> </property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -180,50 +179,49 @@
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="fullscreen_check">
+ <object class="GtkCheckButton" id="fullscreen_check">
<property name="label" translatable="yes">_Full screen</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">5</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="plugin_options_vbox">
+ <object class="GtkVBox" id="plugin_options_vbox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<placeholder/>
</child>
- </widget>
+ </object>
<packing>
<property name="position">6</property>
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area1">
+ <object class="GtkHButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="button1">
+ <object class="GtkButton" id="button1">
<property name="label">gtk-cancel</property>
- <property name="response_id">-6</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -231,9 +229,8 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button2">
+ <object class="GtkButton" id="button2">
<property name="label">gtk-connect</property>
- <property name="response_id">-5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -241,24 +238,28 @@
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkDialog" id="auth_required_dialog">
+ <action-widgets>
+ <action-widget response="-6">button1</action-widget>
+ <action-widget response="-5">button2</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="auth_required_dialog">
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">5</property>
<property name="resizable">False</property>
@@ -268,31 +269,31 @@
<property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox2">
+ <object class="GtkVBox" id="dialog-vbox2">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkVBox" id="vbox1">
+ <object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label5">
+ <object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes"><b>Authentication is required</b></property>
<property name="use_markup">True</property>
<property name="wrap">True</property>
- </widget>
+ </object>
<packing>
<property name="padding">6</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkTable" id="table3">
+ <object class="GtkTable" id="table3">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="n_rows">5</property>
@@ -300,19 +301,19 @@
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
<child>
- <widget class="GtkLabel" id="label12">
+ <object class="GtkLabel" id="label12">
<property name="visible">True</property>
<property name="label"> </property>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkEntry" id="username_entry">
+ <object class="GtkEntry" id="username_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="max_length">254</property>
<property name="activates_default">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
@@ -321,14 +322,14 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="username_label">
+ <object class="GtkLabel" id="username_label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Username:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">username_entry</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -337,7 +338,7 @@
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="save_credential_check">
+ <object class="GtkCheckButton" id="save_credential_check">
<property name="label" translatable="yes">_Remember this credential</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -345,7 +346,7 @@
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
@@ -354,26 +355,26 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="host_label">
+ <object class="GtkLabel" id="host_label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="password_entry">
+ <object class="GtkEntry" id="password_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="max_length">8</property>
<property name="visibility">False</property>
<property name="activates_default">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
@@ -382,14 +383,14 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="password_label">
+ <object class="GtkLabel" id="password_label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Password:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">password_entry</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -398,26 +399,26 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label19">
+ <object class="GtkLabel" id="label19">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Host:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">password_entry</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label1">
+ <object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes"><i><small>All fields above are mandatory</small></i></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">3</property>
@@ -440,31 +441,30 @@
<child>
<placeholder/>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area2">
+ <object class="GtkHButtonBox" id="dialog-action_area2">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="button3">
+ <object class="GtkButton" id="button3">
<property name="label">gtk-cancel</property>
- <property name="response_id">-6</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -472,9 +472,8 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="ok_button">
+ <object class="GtkButton" id="ok_button">
<property name="label" translatable="yes" comments="This is a button label, in the authentication dialog">_Authenticate</property>
- <property name="response_id">-5</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
@@ -483,24 +482,28 @@
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkDialog" id="bookmarks_add_edit_conn_dialog">
+ <action-widgets>
+ <action-widget response="-6">button3</action-widget>
+ <action-widget response="-5">ok_button</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="bookmarks_add_edit_conn_dialog">
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">5</property>
<property name="title" translatable="yes">Bookmarks</property>
@@ -510,25 +513,25 @@
<property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox4">
+ <object class="GtkVBox" id="dialog-vbox4">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkVBox" id="main_box">
+ <object class="GtkVBox" id="main_box">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
- <widget class="GtkHBox" id="hbox1">
+ <object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
<child>
- <widget class="GtkLabel" id="label15">
+ <object class="GtkLabel" id="label15">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes"><b>Connection</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -537,23 +540,23 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="protocol_label">
+ <object class="GtkLabel" id="protocol_label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label"><small>(Type: <i>VNC</i>)</small></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkTable" id="table2">
+ <object class="GtkTable" id="table2">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="n_rows">2</property>
@@ -561,25 +564,25 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkLabel" id="label16">
+ <object class="GtkLabel" id="label16">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label"> </property>
- </widget>
+ </object>
<packing>
<property name="x_options"></property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label14">
+ <object class="GtkLabel" id="label14">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Name:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">edit_bookmark_name_entry</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -588,14 +591,14 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label13">
+ <object class="GtkLabel" id="label13">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Host:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">edit_bookmark_host_entry</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -606,28 +609,27 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="edit_bookmark_name_entry">
+ <object class="GtkEntry" id="edit_bookmark_name_entry">
<property name="width_request">250</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="invisible_char">●</property>
<property name="activates_default">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="edit_bookmark_host_entry">
+ <object class="GtkEntry" id="edit_bookmark_host_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip" translatable="yes">host or host:display or host::port</property>
<property name="invisible_char">●</property>
<property name="activates_default">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
@@ -638,7 +640,7 @@
<child>
<placeholder/>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -646,13 +648,13 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label7">
+ <object class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes"><b>Options</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -661,14 +663,14 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox2">
+ <object class="GtkHBox" id="hbox2">
<property name="visible">True</property>
<child>
- <widget class="GtkLabel" id="label3">
+ <object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label"> </property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -676,43 +678,43 @@
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="fullscreen_check">
+ <object class="GtkCheckButton" id="fullscreen_check">
<property name="label" translatable="yes">_Full screen</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">3</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="plugin_options_vbox">
+ <object class="GtkVBox" id="plugin_options_vbox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<placeholder/>
</child>
- </widget>
+ </object>
<packing>
<property name="position">4</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label10">
+ <object class="GtkLabel" id="label10">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes"><b>Folder</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -721,14 +723,14 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="folder_box">
+ <object class="GtkHBox" id="folder_box">
<property name="visible">True</property>
<child>
- <widget class="GtkLabel" id="label22">
+ <object class="GtkLabel" id="label22">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label"> </property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -738,31 +740,30 @@
<child>
<placeholder/>
</child>
- </widget>
+ </object>
<packing>
<property name="position">6</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area4">
+ <object class="GtkHButtonBox" id="dialog-action_area4">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="button7">
+ <object class="GtkButton" id="button7">
<property name="label">gtk-cancel</property>
- <property name="response_id">-6</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -770,9 +771,8 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="save_button">
+ <object class="GtkButton" id="save_button">
<property name="label">gtk-save</property>
- <property name="response_id">-5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -780,24 +780,28 @@
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkDialog" id="preferences_dialog">
+ <action-widgets>
+ <action-widget response="-6">button7</action-widget>
+ <action-widget response="-5">save_button</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="preferences_dialog">
<property name="border_width">5</property>
<property name="title" translatable="yes">Preferences</property>
<property name="resizable">False</property>
@@ -807,19 +811,19 @@
<property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox5">
+ <object class="GtkVBox" id="dialog-vbox5">
<property name="visible">True</property>
<child>
- <widget class="GtkVBox" id="vbox3">
+ <object class="GtkVBox" id="vbox3">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label17">
+ <object class="GtkLabel" id="label17">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes"><b>Interface</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -827,14 +831,14 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox1">
+ <object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
<property name="spacing">12</property>
<child>
- <widget class="GtkLabel" id="label18">
+ <object class="GtkLabel" id="label18">
<property name="visible">True</property>
<property name="label"> </property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -842,20 +846,19 @@
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox4">
+ <object class="GtkVBox" id="vbox4">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkCheckButton" id="always_show_tabs_check">
+ <object class="GtkCheckButton" id="always_show_tabs_check">
<property name="label" translatable="yes">_Always show tabs</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Whether we should show tabs even when there is only one active connection</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -863,34 +866,33 @@
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="show_accels_check">
+ <object class="GtkCheckButton" id="show_accels_check">
<property name="label" translatable="yes">_Show menu shortcuts</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Whether we should show the menu accelerators (shortcut keys)</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="padding">6</property>
@@ -898,34 +900,37 @@
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area5">
+ <object class="GtkHButtonBox" id="dialog-action_area5">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="button9">
+ <object class="GtkButton" id="button9">
<property name="label">gtk-close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkDialog" id="bookmarks_add_edit_folder_dialog">
+ <action-widgets>
+ <action-widget response="0">button9</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="bookmarks_add_edit_folder_dialog">
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">5</property>
<property name="title" translatable="yes">Bookmarks</property>
@@ -935,18 +940,18 @@
<property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox6">
+ <object class="GtkVBox" id="dialog-vbox6">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkLabel" id="label8">
+ <object class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes"><b>Folder</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -955,32 +960,32 @@
</packing>
</child>
<child>
- <widget class="GtkTable" id="table6">
+ <object class="GtkTable" id="table6">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="n_columns">3</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkLabel" id="label9">
+ <object class="GtkLabel" id="label9">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label"> </property>
- </widget>
+ </object>
<packing>
<property name="x_options"></property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label20">
+ <object class="GtkLabel" id="label20">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Name:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">edit_bookmark_folder_name_entry</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -989,20 +994,20 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="edit_bookmark_folder_name_entry">
+ <object class="GtkEntry" id="edit_bookmark_folder_name_entry">
<property name="width_request">250</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="is_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="activates_default">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -1010,13 +1015,13 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label25">
+ <object class="GtkLabel" id="label25">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes"><b>Parent Folder</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -1025,14 +1030,14 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="folder_box1">
+ <object class="GtkHBox" id="folder_box1">
<property name="visible">True</property>
<child>
- <widget class="GtkLabel" id="label26">
+ <object class="GtkLabel" id="label26">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label"> </property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -1042,26 +1047,25 @@
<child>
<placeholder/>
</child>
- </widget>
+ </object>
<packing>
<property name="position">4</property>
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area6">
+ <object class="GtkHButtonBox" id="dialog-action_area6">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="button5">
+ <object class="GtkButton" id="button5">
<property name="label">gtk-cancel</property>
- <property name="response_id">-6</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -1069,9 +1073,8 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="save_button">
+ <object class="GtkButton" id="save_button">
<property name="label">gtk-save</property>
- <property name="response_id">-5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -1079,21 +1082,25 @@
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
-</glade-interface>
+ <action-widgets>
+ <action-widget response="-6">button5</action-widget>
+ <action-widget response="-5">save_button</action-widget>
+ </action-widgets>
+ </object>
+</interface>
diff --git a/plugins/vnc/vinagre-vnc-tab.c b/plugins/vnc/vinagre-vnc-tab.c
index 677f153..e04a044 100644
--- a/plugins/vnc/vinagre-vnc-tab.c
+++ b/plugins/vnc/vinagre-vnc-tab.c
@@ -20,7 +20,6 @@
*/
#include <glib/gi18n.h>
-#include <glade/glade.h>
#include <vncdisplay.h>
#include <gdk/gdkkeysyms.h>
@@ -415,8 +414,8 @@ ask_credential (VinagreVncTab *vnc_tab,
gchar **username,
gchar **password)
{
- GladeXML *xml;
- const char *glade_file;
+ GtkBuilder *xml;
+ const char *ui_file;
GtkWidget *password_dialog, *host_label, *save_credential_check;
GtkWidget *password_label, *username_label, *image;
gchar *name, *label;
@@ -425,26 +424,33 @@ ask_credential (VinagreVncTab *vnc_tab,
VinagreTab *tab = VINAGRE_TAB (vnc_tab);
VinagreConnection *conn = vinagre_tab_get_conn (tab);
- glade_file = vinagre_utils_get_glade_filename ();
- xml = glade_xml_new (glade_file, NULL, NULL);
+ ui_file = vinagre_utils_get_ui_filename ();
+
+ GError* error = NULL;
+ xml = gtk_builder_new ();
+ if (!gtk_builder_add_from_file (xml, ui_file, &error))
+ {
+ g_warning (_("Couldn't load builder file: &s"), error->message);
+ g_error_free (error);
+ }
- password_dialog = glade_xml_get_widget (xml, "auth_required_dialog");
+ password_dialog = GTK_WIDGET (gtk_builder_get_object (xml, "auth_required_dialog"));
gtk_window_set_transient_for (GTK_WINDOW(password_dialog),
GTK_WINDOW(vinagre_tab_get_window (tab)));
- host_label = glade_xml_get_widget (xml, "host_label");
+ host_label = GTK_WIDGET (gtk_builder_get_object (xml, "host_label"));
name = vinagre_connection_get_best_name (conn);
label = g_strdup_printf ("<i>%s</i>", name);
gtk_label_set_markup (GTK_LABEL (host_label), label);
g_free (name);
g_free (label);
- control.uname = glade_xml_get_widget (xml, "username_entry");
- control.pw = glade_xml_get_widget (xml, "password_entry");
- control.button = glade_xml_get_widget (xml, "ok_button");
- password_label = glade_xml_get_widget (xml, "password_label");
- username_label = glade_xml_get_widget (xml, "username_label");
- save_credential_check = glade_xml_get_widget (xml, "save_credential_check");
+ control.uname = GTK_WIDGET (gtk_builder_get_object (xml, "username_entry"));
+ control.pw = GTK_WIDGET (gtk_builder_get_object (xml, "password_entry"));
+ control.button = GTK_WIDGET (gtk_builder_get_object (xml, "ok_button"));
+ password_label = GTK_WIDGET (gtk_builder_get_object (xml, "password_label"));
+ username_label = GTK_WIDGET (gtk_builder_get_object (xml, "username_label"));
+ save_credential_check = GTK_WIDGET (gtk_builder_get_object (xml, "save_credential_check"));
image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_AUTHENTICATION, GTK_ICON_SIZE_BUTTON);
gtk_button_set_image (GTK_BUTTON (control.button), image);
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0708aa6..ff7f3a5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,7 +3,7 @@
data/GNOME_VinagreApplet.xml
data/vinagre.desktop.in.in
data/vinagre-file.desktop.in.in
-data/vinagre.glade
+data/vinagre.ui
data/vinagre.schemas.in.in
data/vinagre-mime.xml.in
data/vinagre-ui.xml
diff --git a/vinagre/vinagre-bookmarks-ui.c b/vinagre/vinagre-bookmarks-ui.c
index d4b16be..0a57fd5 100644
--- a/vinagre/vinagre-bookmarks-ui.c
+++ b/vinagre/vinagre-bookmarks-ui.c
@@ -18,7 +18,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <glade/glade.h>
#include <string.h>
#include <glib/gi18n.h>
@@ -41,17 +40,22 @@ show_dialog_folder (VinagreBookmarks *book,
VinagreBookmarksEntry *entry,
gboolean is_add)
{
- GladeXML *xml;
+ GtkBuilder *xml;
GtkWidget *dialog, *box, *tree, *name_entry, *save_button;
const gchar *name;
- xml = glade_xml_new (vinagre_utils_get_glade_filename (),
- "bookmarks_add_edit_folder_dialog",
- NULL);
- dialog = glade_xml_get_widget (xml, "bookmarks_add_edit_folder_dialog");
- name_entry = glade_xml_get_widget (xml, "edit_bookmark_folder_name_entry");
- box = glade_xml_get_widget (xml, "folder_box1");
- save_button= glade_xml_get_widget (xml, "save_button");
+ GError* error = NULL;
+ xml = gtk_builder_new ();
+ if (!gtk_builder_add_from_file (xml, vinagre_utils_get_ui_filename (), &error))
+ {
+ g_warning (_("Couldn't load builder file: &s"), error->message);
+ g_error_free (error);
+ }
+
+ dialog = GTK_WIDGET (gtk_builder_get_object (xml, "bookmarks_add_edit_folder_dialog"));
+ name_entry = GTK_WIDGET (gtk_builder_get_object (xml, "edit_bookmark_folder_name_entry"));
+ box = GTK_WIDGET (gtk_builder_get_object (xml, "folder_box1"));
+ save_button= GTK_WIDGET (gtk_builder_get_object (xml, "save_button"));
gtk_window_set_transient_for (GTK_WINDOW (dialog), window);
gtk_entry_set_text (GTK_ENTRY (name_entry), vinagre_bookmarks_entry_get_name (entry));
@@ -123,7 +127,7 @@ show_dialog_conn (VinagreBookmarks *book,
{
gchar *str, *host, *error_str, *protocol;
gint port;
- GladeXML *xml;
+ GtkBuilder *xml;
GtkWidget *dialog, *host_entry, *name_entry, *fs_check;
GtkWidget *folder_box, *tree, *save_button, *plugin_box;
GtkWidget *plugin_options, *protocol_label;
@@ -132,17 +136,22 @@ show_dialog_conn (VinagreBookmarks *book,
VinagrePlugin *plugin;
gchar **props;
- xml = glade_xml_new (vinagre_utils_get_glade_filename (),
- "bookmarks_add_edit_conn_dialog",
- NULL);
- dialog = glade_xml_get_widget (xml, "bookmarks_add_edit_conn_dialog");
- name_entry = glade_xml_get_widget (xml, "edit_bookmark_name_entry");
- host_entry = glade_xml_get_widget (xml, "edit_bookmark_host_entry");
- fs_check = glade_xml_get_widget (xml, "fullscreen_check");
- folder_box = glade_xml_get_widget (xml, "folder_box");
- plugin_box = glade_xml_get_widget (xml, "plugin_options_vbox");
- save_button = glade_xml_get_widget (xml, "save_button");
- protocol_label = glade_xml_get_widget (xml, "protocol_label");
+ GError* error = NULL;
+ xml = gtk_builder_new ();
+ if (!gtk_builder_add_from_file (xml, vinagre_utils_get_ui_filename (), &error))
+ {
+ g_warning (_("Couldn't load builder file: &s"), error->message);
+ g_error_free (error);
+ }
+
+ dialog = GTK_WIDGET (gtk_builder_get_object (xml, "bookmarks_add_edit_conn_dialog"));
+ name_entry = GTK_WIDGET (gtk_builder_get_object (xml, "edit_bookmark_name_entry"));
+ host_entry = GTK_WIDGET (gtk_builder_get_object (xml, "edit_bookmark_host_entry"));
+ fs_check = GTK_WIDGET (gtk_builder_get_object (xml, "fullscreen_check"));
+ folder_box = GTK_WIDGET (gtk_builder_get_object (xml, "folder_box"));
+ plugin_box = GTK_WIDGET (gtk_builder_get_object (xml, "plugin_options_vbox"));
+ save_button = GTK_WIDGET (gtk_builder_get_object (xml, "save_button"));
+ protocol_label = GTK_WIDGET (gtk_builder_get_object (xml, "protocol_label"));
gtk_window_set_transient_for (GTK_WINDOW (dialog), window);
conn = vinagre_bookmarks_entry_get_conn (entry);
diff --git a/vinagre/vinagre-connect.c b/vinagre/vinagre-connect.c
index 75569f3..86b8933 100644
--- a/vinagre/vinagre-connect.c
+++ b/vinagre/vinagre-connect.c
@@ -25,7 +25,6 @@
#include <glib.h>
#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include <glade/glade.h>
#include <string.h>
#ifdef VINAGRE_ENABLE_AVAHI
@@ -40,7 +39,7 @@
#include "vinagre-plugin.h"
typedef struct {
- GladeXML *xml;
+ GtkBuilder *xml;
GtkWidget *dialog;
GtkWidget *protocol_combo;
GtkWidget *protocol_description_label;
@@ -366,16 +365,23 @@ VinagreConnection *vinagre_connect (VinagreWindow *window)
gint result;
VinagreConnectDialog dialog;
- dialog.xml = glade_xml_new (vinagre_utils_get_glade_filename (), "connect_dialog", NULL);
- dialog.dialog = glade_xml_get_widget (dialog.xml, "connect_dialog");
+ GError* error = NULL;
+ dialog.xml = gtk_builder_new ();
+ if (!gtk_builder_add_from_file (dialog.xml, vinagre_utils_get_ui_filename (), &error))
+ {
+ g_warning (_("Couldn't load builder file: &s"), error->message);
+ g_error_free (error);
+ }
+
+ dialog.dialog = GTK_WIDGET (gtk_builder_get_object (dialog.xml, "connect_dialog"));
gtk_window_set_transient_for (GTK_WINDOW (dialog.dialog), GTK_WINDOW (window));
- dialog.protocol_combo = glade_xml_get_widget (dialog.xml, "protocol_combo");
- dialog.protocol_description_label = glade_xml_get_widget (dialog.xml, "protocol_description_label");
- dialog.host_entry = glade_xml_get_widget (dialog.xml, "host_entry");
- dialog.find_button = glade_xml_get_widget (dialog.xml, "find_button");
- dialog.fullscreen_check = glade_xml_get_widget (dialog.xml, "fullscreen_check");
- dialog.plugin_box = glade_xml_get_widget (dialog.xml, "plugin_options_vbox");
+ dialog.protocol_combo = GTK_WIDGET (gtk_builder_get_object (dialog.xml, "protocol_combo"));
+ dialog.protocol_description_label = GTK_WIDGET (gtk_builder_get_object (dialog.xml, "protocol_description_label"));
+ dialog.host_entry = GTK_WIDGET (gtk_builder_get_object (dialog.xml, "host_entry"));
+ dialog.find_button = GTK_WIDGET (gtk_builder_get_object (dialog.xml, "find_button"));
+ dialog.fullscreen_check = GTK_WIDGET (gtk_builder_get_object (dialog.xml, "fullscreen_check"));
+ dialog.plugin_box = GTK_WIDGET (gtk_builder_get_object (dialog.xml, "plugin_options_vbox"));
setup_protocol (&dialog);
setup_combo (dialog.host_entry);
diff --git a/vinagre/vinagre-prefs.c b/vinagre/vinagre-prefs.c
index 35fe003..8c003a3 100644
--- a/vinagre/vinagre-prefs.c
+++ b/vinagre/vinagre-prefs.c
@@ -20,7 +20,6 @@
#include <gconf/gconf-client.h>
#include <glib/gi18n.h>
-#include <glade/glade.h>
#include "vinagre-prefs.h"
#include "vinagre-utils.h"
@@ -478,10 +477,10 @@ vinagre_prefs_class_init (VinagrePrefsClass *klass)
/* Preferences dialog */
typedef struct {
- GladeXML *xml;
- GtkWidget *dialog;
- GtkWidget *show_tabs;
- GtkWidget *show_accels;
+ GtkBuilder *xml;
+ GtkWidget *dialog;
+ GtkWidget *show_tabs;
+ GtkWidget *show_accels;
} VinagrePrefsDialog;
static void
@@ -530,12 +529,19 @@ vinagre_prefs_dialog_show (VinagreWindow *window)
dialog = g_new (VinagrePrefsDialog, 1);
- dialog->xml = glade_xml_new (vinagre_utils_get_glade_filename (), NULL, NULL);
- dialog->dialog = glade_xml_get_widget (dialog->xml, "preferences_dialog");
+ GError* error = NULL;
+ dialog->xml = gtk_builder_new ();
+ if (!gtk_builder_add_from_file (dialog->xml, vinagre_utils_get_ui_filename (), &error))
+ {
+ g_warning (_("Couldn't load builder file: &s"), error->message);
+ g_error_free (error);
+ }
+
+ dialog->dialog = GTK_WIDGET (gtk_builder_get_object (dialog->xml, "preferences_dialog"));
gtk_window_set_transient_for (GTK_WINDOW (dialog->dialog), GTK_WINDOW (window));
- dialog->show_tabs = glade_xml_get_widget (dialog->xml, "always_show_tabs_check");
- dialog->show_accels = glade_xml_get_widget (dialog->xml, "show_accels_check");
+ dialog->show_tabs = GTK_WIDGET (gtk_builder_get_object (dialog->xml, "always_show_tabs_check"));
+ dialog->show_accels = GTK_WIDGET (gtk_builder_get_object (dialog->xml, "show_accels_check"));
vinagre_prefs_dialog_setup (dialog);
diff --git a/vinagre/vinagre-tab.c b/vinagre/vinagre-tab.c
index a2e765e..d01aecb 100644
--- a/vinagre/vinagre-tab.c
+++ b/vinagre/vinagre-tab.c
@@ -24,7 +24,6 @@
#endif
#include <glib/gi18n.h>
-#include <glade/glade.h>
#include <gnome-keyring.h>
#include "vinagre-tab.h"
diff --git a/vinagre/vinagre-utils.c b/vinagre/vinagre-utils.c
index 755c371..e6a5a56 100644
--- a/vinagre/vinagre-utils.c
+++ b/vinagre/vinagre-utils.c
@@ -22,7 +22,7 @@
#include <glib/gi18n.h>
#include "vinagre-utils.h"
-#define VINAGRE_GLADE_FILE "vinagre.glade"
+#define VINAGRE_UI_FILE "vinagre.ui"
#define VINAGRE_UI_XML_FILE "vinagre-ui.xml"
#ifdef HAVE_CONFIG_H
@@ -119,12 +119,12 @@ vinagre_utils_toggle_widget_visible (GtkWidget *widget)
}
const gchar *
-vinagre_utils_get_glade_filename (void)
+vinagre_utils_get_ui_filename (void)
{
- if (g_file_test (VINAGRE_GLADE_FILE, G_FILE_TEST_EXISTS))
- return VINAGRE_GLADE_FILE;
+ if (g_file_test (VINAGRE_UI_FILE, G_FILE_TEST_EXISTS))
+ return VINAGRE_UI_FILE;
else
- return VINAGRE_DATADIR "/" VINAGRE_GLADE_FILE;
+ return VINAGRE_DATADIR "/" VINAGRE_UI_FILE;
}
const gchar *
diff --git a/vinagre/vinagre-utils.h b/vinagre/vinagre-utils.h
index 9c91590..4b5e04a 100644
--- a/vinagre/vinagre-utils.h
+++ b/vinagre/vinagre-utils.h
@@ -43,7 +43,7 @@ void vinagre_utils_show_many_errors (const gchar *title,
void vinagre_utils_toggle_widget_visible (GtkWidget *widget);
-const gchar *vinagre_utils_get_glade_filename (void);
+const gchar *vinagre_utils_get_ui_filename (void);
const gchar *vinagre_utils_get_ui_xml_filename (void);
gchar *vinagre_utils_escape_underscores (const gchar *text,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
