Adding debian version 0.5.8-2. debian/0.5.8-2
authorDaniel Baumann <daniel@debian.org>
Fri, 20 Apr 2012 11:52:32 +0000 (13:52 +0200)
committerDaniel Baumann <daniel@debian.org>
Fri, 20 Apr 2012 11:52:32 +0000 (13:52 +0200)
14 files changed:
debian/changelog
debian/control
debian/lxde-x-terminal-emulator.desktop
debian/lxde-x-www-browser.desktop
debian/lxpanel-dev.install [new file with mode: 0644]
debian/lxpanel.install
debian/patches/default-config.patch
debian/patches/missing_glades.patch [deleted file]
debian/patches/potfiles-in.patch [new file with mode: 0644]
debian/patches/redefine-alarm-variable.patch [deleted file]
debian/patches/run-in-background.patch [new file with mode: 0644]
debian/patches/series
debian/rules
debian/source/options [deleted file]

index 57c2a6c..14c2b0c 100644 (file)
@@ -1,10 +1,19 @@
-lxpanel (0.5.8-1.1) unstable; urgency=low
-
-  * Non-maintainer upload.
-  * Use dh-autoreconf to run autoreconf and intltoolize before
-    configure. (Closes: #658001)
-
- -- Sébastien Villemot <sebastien.villemot@ens.fr>  Sat, 18 Feb 2012 17:19:17 +0100
+lxpanel (0.5.8-2) unstable; urgency=low
+
+  [ Sergey Slipchenko ]
+  * Remove lintian-overrides from install
+  * Removed unused patch
+  * Changed icon to browser
+  * Drop debian/source/options
+  * Drop missing_glades.patch (Closes: #658001)
+  * Refresh default-config.patch
+  * Add potfiles-in.patch
+  * Remove override_dh_auto_test from rules
+  * Add run-in-background.patch (Closes: #656672)
+  * Move development files to lxpanel-dev (Closes: #581959)
+  * Change icon name to web-browser
+
+ -- Andrew Lee (李健秋) <ajqlee@debian.org>  Sat, 03 Mar 2012 18:08:09 +0800
 
 lxpanel (0.5.8-1) unstable; urgency=low
 
index 99ea23e..dd75c58 100644 (file)
@@ -7,8 +7,7 @@ Build-Depends:
  debhelper (>= 8), autotools-dev, docbook-xml, docbook-xsl, intltool,
  intltool-debian, libasound2-dev, libglib2.0-dev (>=2.10),
  libgtk2.0-dev (>=2.6), libiw-dev [linux-any],
- libmenu-cache1-dev (>=0.3.2), libxpm-dev, python, xsltproc,
- dh-autoreconf, autopoint
+ libmenu-cache1-dev (>=0.3.2), libxpm-dev, python, xsltproc
 Standards-Version: 3.9.2
 Homepage: http://lxde.org
 Vcs-Git: git://git.debian.org/git/pkg-lxde/lxpanel.git
@@ -17,7 +16,6 @@ Vcs-Browser: http://git.debian.org/?p=pkg-lxde/lxpanel.git
 Package: lxpanel
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, lxmenu-data
-Recommends: manpages-dev
 Suggests: lxsession-lite (>=0.3.5) | lxsession (>=0.3.2) | menu, www-browser
 Description: lightweight desktop panel for X
  LXPanel is a lightweight GTK+2 desktop panel derived from fbpanel. Its
@@ -37,3 +35,29 @@ Description: lightweight desktop panel for X
     For example, "lxpanelctl run" will show the Run dialog in lxpanel,
     and "lxpanelctl menu" will show the application menu. This is
     useful in combination with window manager key bindings.
+
+Package: lxpanel-dev
+Architecture: any
+Depends: ${misc:Depends}, lxpanel (= ${binary:Version}), libglib2.0-dev,
+ libmenu-cache1-dev, pkg-config
+Recommends: manpages-dev
+Description: lightweight desktop panel for X - development files
+ LXPanel is a lightweight GTK+2 desktop panel derived from fbpanel. Its
+ features include:
+  * User-friendly application menu automatically generated from .desktop
+    files on the system
+  * Launcher bar (small icons clicked to launch apps)
+  * Task bar supporting ICCCM/EWMH `urgency' hint (Pidgin IM windows
+    can flash on new incoming messages)
+  * Run dialog (type a command to run, without opening a terminal)
+  * Net status icon plug-in (optional).
+  * Volume control plug-in (optional).
+  * Notification area (system tray).
+  * Digital clock.
+  * Keyboard LEDs plug-in (display caps/num locks).
+  * lxpanelctl: control lxpanel from other programs.
+    For example, "lxpanelctl run" will show the Run dialog in lxpanel,
+    and "lxpanelctl menu" will show the application menu. This is
+    useful in combination with window manager key bindings.
+ .
+ This package contains files needed for panel plugin development.
index 42294c4..8ba47f5 100644 (file)
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Version=1.0
 Name=Terminal emulator
 Name[pt_BR]=Emulador de terminal
@@ -18,5 +17,3 @@ Type=Application
 Categories=System;TerminalEmulator;Utility;
 StartupNotify=true
 NoDisplay=true
-
-# vi:set encoding=UTF-8:
index 2320126..4b50af5 100644 (file)
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=Web Browser
 Name[pt_BR]=Navegador web
 Name[zh_TW]=瀏覽器
@@ -10,5 +9,5 @@ Exec=/usr/bin/x-www-browser %u
 Terminal=false
 Type=Application
 Categories=GTK;WebBrowser;Network
-Icon=applications-internet
+Icon=web-browser
 NoDisplay=true
diff --git a/debian/lxpanel-dev.install b/debian/lxpanel-dev.install
new file mode 100644 (file)
index 0000000..f49c875
--- /dev/null
@@ -0,0 +1,2 @@
+usr/include
+usr/lib/pkgconfig
index 232f275..7e382ba 100644 (file)
@@ -1,3 +1,5 @@
 debian/lxde-x-terminal-emulator.desktop usr/share/applications
 debian/lxde-x-www-browser.desktop usr/share/applications
-debian/lxpanel.lintian-overrides usr/share/lintian/overrides
+usr/bin
+usr/lib/lxpanel
+usr/share
index cfd5d8e..fc0730a 100644 (file)
@@ -1,12 +1,13 @@
 --- a/data/default/panels/panel.in
 +++ b/data/default/panels/panel.in
-@@ -53,10 +53,7 @@
+@@ -53,10 +53,10 @@ Plugin {
              id=pcmanfm.desktop
          }
          Button {
 -            id=gnome-terminal.desktop
--        }
--        Button {
++            id=lxde-x-terminal-emulator.desktop
+         }
+         Button {
 -            id=firefox.desktop
 +            id=lxde-x-www-browser.desktop
          }
diff --git a/debian/patches/missing_glades.patch b/debian/patches/missing_glades.patch
deleted file mode 100644 (file)
index 02f6664..0000000
+++ /dev/null
@@ -1,2191 +0,0 @@
---- /dev/null
-+++ b/data/ui/launchbar.glade
-@@ -0,0 +1,196 @@
-+<?xml version="1.0"?>
-+<interface>
-+  <!-- interface-requires gtk+ 2.12 -->
-+  <!-- interface-naming-policy project-wide -->
-+  <object class="GtkListStore" id="defined_store">
-+    <columns>
-+      <!-- column-name icon -->
-+      <column type="GdkPixbuf"/>
-+      <!-- column-name title -->
-+      <column type="gchararray"/>
-+      <!-- column-name icon_name -->
-+      <column type="gchararray"/>
-+      <!-- column-name btn -->
-+      <column type="gpointer"/>
-+    </columns>
-+  </object>
-+  <object class="GtkTreeStore" id="menu_store">
-+    <columns>
-+      <!-- column-name icon -->
-+      <column type="GdkPixbuf"/>
-+      <!-- column-name title -->
-+      <column type="gchararray"/>
-+      <!-- column-name icon_name -->
-+      <column type="gchararray"/>
-+      <!-- column-name btn -->
-+      <column type="gpointer"/>
-+    </columns>
-+  </object>
-+  <object class="GtkDialog" id="dlg">
-+    <property name="border_width">10</property>
-+    <property name="title" translatable="yes">Application Launch Bar</property>
-+    <property name="default_width">640</property>
-+    <property name="default_height">400</property>
-+    <property name="type_hint">normal</property>
-+    <property name="has_separator">False</property>
-+    <child internal-child="vbox">
-+      <object class="GtkVBox" id="dialog-vbox">
-+        <property name="visible">True</property>
-+        <property name="orientation">vertical</property>
-+        <property name="spacing">6</property>
-+        <child>
-+          <object class="GtkHBox" id="hbox1">
-+            <property name="visible">True</property>
-+            <property name="spacing">12</property>
-+            <child>
-+              <object class="GtkScrolledWindow" id="scroll1">
-+                <property name="visible">True</property>
-+                <property name="can_focus">True</property>
-+                <property name="hscrollbar_policy">automatic</property>
-+                <property name="vscrollbar_policy">automatic</property>
-+                <property name="shadow_type">etched-in</property>
-+                <child>
-+                  <object class="GtkTreeView" id="defined_view">
-+                    <property name="visible">True</property>
-+                    <property name="can_focus">True</property>
-+                    <property name="model">defined_store</property>
-+                    <property name="search_column">1</property>
-+                    <child>
-+                      <object class="GtkTreeViewColumn" id="defined_col">
-+                        <property name="title">Applications</property>
-+                        <property name="expand">True</property>
-+                      </object>
-+                    </child>
-+                  </object>
-+                </child>
-+              </object>
-+              <packing>
-+                <property name="position">0</property>
-+              </packing>
-+            </child>
-+            <child>
-+              <object class="GtkVBox" id="vbox1">
-+                <property name="visible">True</property>
-+                <property name="orientation">vertical</property>
-+                <property name="spacing">6</property>
-+                <child>
-+                  <object class="GtkButton" id="add">
-+                    <property name="label">gtk-add</property>
-+                    <property name="visible">True</property>
-+                    <property name="can_focus">True</property>
-+                    <property name="receives_default">True</property>
-+                    <property name="use_stock">True</property>
-+                  </object>
-+                  <packing>
-+                    <property name="expand">False</property>
-+                    <property name="position">0</property>
-+                  </packing>
-+                </child>
-+                <child>
-+                  <object class="GtkButton" id="remove">
-+                    <property name="label">gtk-remove</property>
-+                    <property name="visible">True</property>
-+                    <property name="can_focus">True</property>
-+                    <property name="receives_default">True</property>
-+                    <property name="use_stock">True</property>
-+                  </object>
-+                  <packing>
-+                    <property name="expand">False</property>
-+                    <property name="position">1</property>
-+                  </packing>
-+                </child>
-+                <child>
-+                  <object class="GtkButton" id="up">
-+                    <property name="label">gtk-go-up</property>
-+                    <property name="visible">True</property>
-+                    <property name="can_focus">True</property>
-+                    <property name="receives_default">True</property>
-+                    <property name="use_stock">True</property>
-+                  </object>
-+                  <packing>
-+                    <property name="expand">False</property>
-+                    <property name="position">2</property>
-+                  </packing>
-+                </child>
-+                <child>
-+                  <object class="GtkButton" id="down">
-+                    <property name="label">gtk-go-down</property>
-+                    <property name="visible">True</property>
-+                    <property name="can_focus">True</property>
-+                    <property name="receives_default">True</property>
-+                    <property name="use_stock">True</property>
-+                  </object>
-+                  <packing>
-+                    <property name="expand">False</property>
-+                    <property name="position">3</property>
-+                  </packing>
-+                </child>
-+              </object>
-+              <packing>
-+                <property name="expand">False</property>
-+                <property name="position">1</property>
-+              </packing>
-+            </child>
-+            <child>
-+              <object class="GtkScrolledWindow" id="scroll2">
-+                <property name="visible">True</property>
-+                <property name="can_focus">True</property>
-+                <property name="hscrollbar_policy">automatic</property>
-+                <property name="vscrollbar_policy">automatic</property>
-+                <property name="shadow_type">etched-in</property>
-+                <child>
-+                  <object class="GtkTreeView" id="menu_view">
-+                    <property name="visible">True</property>
-+                    <property name="can_focus">True</property>
-+                    <property name="model">menu_store</property>
-+                    <property name="search_column">1</property>
-+                    <child>
-+                      <object class="GtkTreeViewColumn" id="menu_col">
-+                        <property name="title">Available Applications</property>
-+                        <property name="expand">True</property>
-+                      </object>
-+                    </child>
-+                  </object>
-+                </child>
-+              </object>
-+              <packing>
-+                <property name="position">2</property>
-+              </packing>
-+            </child>
-+          </object>
-+          <packing>
-+            <property name="position">1</property>
-+          </packing>
-+        </child>
-+        <child internal-child="action_area">
-+          <object class="GtkHButtonBox" id="dialog-action_area">
-+            <property name="visible">True</property>
-+            <property name="layout_style">end</property>
-+            <child>
-+              <object class="GtkButton" id="close">
-+                <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>
-+              </object>
-+              <packing>
-+                <property name="expand">False</property>
-+                <property name="fill">False</property>
-+                <property name="position">0</property>
-+              </packing>
-+            </child>
-+          </object>
-+          <packing>
-+            <property name="expand">False</property>
-+            <property name="pack_type">end</property>
-+            <property name="position">0</property>
-+          </packing>
-+        </child>
-+      </object>
-+    </child>
-+    <action-widgets>
-+      <action-widget response="-7">close</action-widget>
-+    </action-widgets>
-+  </object>
-+</interface>
---- a/data/ui/launchbar.ui
-+++ /dev/null
-@@ -1 +0,0 @@
--<?xml version="1.0"?><interface><object class="GtkListStore" id="defined_store"><columns><column type="GdkPixbuf"/><column type="gchararray"/><column type="gchararray"/><column type="gpointer"/></columns></object><object class="GtkTreeStore" id="menu_store"><columns><column type="GdkPixbuf"/><column type="gchararray"/><column type="gchararray"/><column type="gpointer"/></columns></object><object class="GtkDialog" id="dlg"><property name="border_width">10</property><property name="title" translatable="yes">Application Launch Bar</property><property name="default_width">640</property><property name="default_height">400</property><property name="type_hint">normal</property><property name="has_separator">False</property><child internal-child="vbox"><object class="GtkVBox" id="dialog-vbox"><property name="visible">True</property><property name="orientation">vertical</property><property name="spacing">6</property><child><object class="GtkHBox" id="hbox1"><property name="visible">True</property><property name="spacing">12</property><child><object class="GtkScrolledWindow" id="scroll1"><property name="visible">True</property><property name="can_focus">True</property><property name="hscrollbar_policy">automatic</property><property name="vscrollbar_policy">automatic</property><property name="shadow_type">etched-in</property><child><object class="GtkTreeView" id="defined_view"><property name="visible">True</property><property name="can_focus">True</property><property name="model">defined_store</property><property name="search_column">1</property><child><object class="GtkTreeViewColumn" id="defined_col"><property name="title">Applications</property><property name="expand">True</property></object></child></object></child></object><packing><property name="position">0</property></packing></child><child><object class="GtkVBox" id="vbox1"><property name="visible">True</property><property name="orientation">vertical</property><property name="spacing">6</property><child><object class="GtkButton" id="add"><property name="label">gtk-add</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">True</property><property name="use_stock">True</property></object><packing><property name="expand">False</property><property name="position">0</property></packing></child><child><object class="GtkButton" id="remove"><property name="label">gtk-remove</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">True</property><property name="use_stock">True</property></object><packing><property name="expand">False</property><property name="position">1</property></packing></child><child><object class="GtkButton" id="up"><property name="label">gtk-go-up</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">True</property><property name="use_stock">True</property></object><packing><property name="expand">False</property><property name="position">2</property></packing></child><child><object class="GtkButton" id="down"><property name="label">gtk-go-down</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">True</property><property name="use_stock">True</property></object><packing><property name="expand">False</property><property name="position">3</property></packing></child></object><packing><property name="expand">False</property><property name="position">1</property></packing></child><child><object class="GtkScrolledWindow" id="scroll2"><property name="visible">True</property><property name="can_focus">True</property><property name="hscrollbar_policy">automatic</property><property name="vscrollbar_policy">automatic</property><property name="shadow_type">etched-in</property><child><object class="GtkTreeView" id="menu_view"><property name="visible">True</property><property name="can_focus">True</property><property name="model">menu_store</property><property name="search_column">1</property><child><object class="GtkTreeViewColumn" id="menu_col"><property name="title">Available Applications</property><property name="expand">True</property></object></child></object></child></object><packing><property name="position">2</property></packing></child></object><packing><property name="position">1</property></packing></child><child internal-child="action_area"><object class="GtkHButtonBox" id="dialog-action_area"><property name="visible">True</property><property name="layout_style">end</property><child><object class="GtkButton" id="close"><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></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child></object><packing><property name="expand">False</property><property name="pack_type">end</property><property name="position">0</property></packing></child></object></child><action-widgets><action-widget response="-7">close</action-widget></action-widgets></object></interface>
---- /dev/null
-+++ b/data/ui/netstatus.glade
-@@ -0,0 +1,839 @@
-+<?xml version="1.0"?>
-+<interface>
-+  <requires lib="gtk+" version="2.16"/>
-+  <!-- interface-naming-policy toplevel-contextual -->
-+  <object class="GtkDialog" id="network_status_dialog">
-+    <property name="border_width">5</property>
-+    <property name="resizable">False</property>
-+    <property name="window_position">center</property>
-+    <property name="default_width">300</property>
-+    <property name="type_hint">dialog</property>
-+    <property name="has_separator">False</property>
-+    <child internal-child="vbox">
-+      <object class="GtkVBox" id="dialog-vbox2">
-+        <property name="visible">True</property>
-+        <property name="spacing">2</property>
-+        <child>
-+          <object class="GtkNotebook" id="notebook1">
-+            <property name="visible">True</property>
-+            <property name="can_focus">True</property>
-+            <property name="border_width">5</property>
-+            <child>
-+              <object class="GtkVBox" id="vbox1">
-+                <property name="visible">True</property>
-+                <property name="border_width">12</property>
-+                <property name="spacing">18</property>
-+                <child>
-+                  <object class="GtkVBox" id="connection_frame">
-+                    <property name="visible">True</property>
-+                    <property name="spacing">6</property>
-+                    <child>
-+                      <object class="GtkLabel" id="label3">
-+                        <property name="visible">True</property>
-+                        <property name="xalign">0</property>
-+                        <property name="label" translatable="yes">&lt;b&gt;Connection&lt;/b&gt;</property>
-+                        <property name="use_markup">True</property>
-+                      </object>
-+                      <packing>
-+                        <property name="expand">False</property>
-+                        <property name="fill">False</property>
-+                        <property name="position">0</property>
-+                      </packing>
-+                    </child>
-+                    <child>
-+                      <object class="GtkHBox" id="hbox6">
-+                        <property name="visible">True</property>
-+                        <child>
-+                          <object class="GtkLabel" id="label43">
-+                            <property name="visible">True</property>
-+                            <property name="label">    </property>
-+                          </object>
-+                          <packing>
-+                            <property name="expand">False</property>
-+                            <property name="fill">False</property>
-+                            <property name="position">0</property>
-+                          </packing>
-+                        </child>
-+                        <child>
-+                          <object class="GtkHBox" id="connection_hbox">
-+                            <property name="visible">True</property>
-+                            <property name="spacing">12</property>
-+                            <child>
-+                              <object class="GtkTable" id="connection_table">
-+                                <property name="visible">True</property>
-+                                <property name="n_rows">2</property>
-+                                <property name="n_columns">2</property>
-+                                <property name="column_spacing">12</property>
-+                                <property name="row_spacing">6</property>
-+                                <child>
-+                                  <object class="GtkLabel" id="label5">
-+                                    <property name="visible">True</property>
-+                                    <property name="xalign">0</property>
-+                                    <property name="label" translatable="yes">Status:</property>
-+                                  </object>
-+                                  <packing>
-+                                    <property name="top_attach">1</property>
-+                                    <property name="bottom_attach">2</property>
-+                                    <property name="x_options">GTK_FILL</property>
-+                                    <property name="y_options"></property>
-+                                  </packing>
-+                                </child>
-+                                <child>
-+                                  <object class="GtkLabel" id="status_label">
-+                                    <property name="visible">True</property>
-+                                    <property name="can_focus">True</property>
-+                                    <property name="xalign">0</property>
-+                                    <property name="selectable">True</property>
-+                                  </object>
-+                                  <packing>
-+                                    <property name="left_attach">1</property>
-+                                    <property name="right_attach">2</property>
-+                                    <property name="top_attach">1</property>
-+                                    <property name="bottom_attach">2</property>
-+                                    <property name="x_options">GTK_FILL</property>
-+                                    <property name="y_options"></property>
-+                                  </packing>
-+                                </child>
-+                                <child>
-+                                  <object class="GtkLabel" id="label16">
-+                                    <property name="visible">True</property>
-+                                    <property name="xalign">0</property>
-+                                    <property name="label" translatable="yes">_Name:</property>
-+                                    <property name="use_underline">True</property>
-+                                  </object>
-+                                  <packing>
-+                                    <property name="x_options">GTK_FILL</property>
-+                                    <property name="y_options"></property>
-+                                  </packing>
-+                                </child>
-+                                <child>
-+                                  <object class="GtkComboBoxEntry" id="name_combo">
-+                                    <property name="visible">True</property>
-+                                  </object>
-+                                  <packing>
-+                                    <property name="left_attach">1</property>
-+                                    <property name="right_attach">2</property>
-+                                    <property name="x_options"></property>
-+                                    <property name="y_options"></property>
-+                                  </packing>
-+                                </child>
-+                              </object>
-+                              <packing>
-+                                <property name="position">0</property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <placeholder/>
-+                            </child>
-+                          </object>
-+                          <packing>
-+                            <property name="position">1</property>
-+                          </packing>
-+                        </child>
-+                      </object>
-+                      <packing>
-+                        <property name="position">1</property>
-+                      </packing>
-+                    </child>
-+                  </object>
-+                  <packing>
-+                    <property name="expand">False</property>
-+                    <property name="position">0</property>
-+                  </packing>
-+                </child>
-+                <child>
-+                  <object class="GtkVBox" id="activity_frame">
-+                    <property name="visible">True</property>
-+                    <property name="spacing">6</property>
-+                    <child>
-+                      <object class="GtkLabel" id="label4">
-+                        <property name="visible">True</property>
-+                        <property name="xalign">0</property>
-+                        <property name="label" translatable="yes">&lt;b&gt;Activity&lt;/b&gt;</property>
-+                        <property name="use_markup">True</property>
-+                      </object>
-+                      <packing>
-+                        <property name="expand">False</property>
-+                        <property name="fill">False</property>
-+                        <property name="position">0</property>
-+                      </packing>
-+                    </child>
-+                    <child>
-+                      <object class="GtkHBox" id="hbox8">
-+                        <property name="visible">True</property>
-+                        <child>
-+                          <object class="GtkLabel" id="label44">
-+                            <property name="visible">True</property>
-+                            <property name="label">    </property>
-+                          </object>
-+                          <packing>
-+                            <property name="expand">False</property>
-+                            <property name="fill">False</property>
-+                            <property name="position">0</property>
-+                          </packing>
-+                        </child>
-+                        <child>
-+                          <object class="GtkTable" id="table2">
-+                            <property name="visible">True</property>
-+                            <property name="n_rows">2</property>
-+                            <property name="n_columns">2</property>
-+                            <property name="column_spacing">12</property>
-+                            <property name="row_spacing">6</property>
-+                            <child>
-+                              <object class="GtkLabel" id="received_label">
-+                                <property name="visible">True</property>
-+                                <property name="can_focus">True</property>
-+                                <property name="xalign">0</property>
-+                                <property name="selectable">True</property>
-+                              </object>
-+                              <packing>
-+                                <property name="left_attach">1</property>
-+                                <property name="right_attach">2</property>
-+                                <property name="x_options">GTK_FILL</property>
-+                                <property name="y_options"></property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <object class="GtkLabel" id="sent_label">
-+                                <property name="visible">True</property>
-+                                <property name="can_focus">True</property>
-+                                <property name="xalign">0</property>
-+                                <property name="selectable">True</property>
-+                              </object>
-+                              <packing>
-+                                <property name="left_attach">1</property>
-+                                <property name="right_attach">2</property>
-+                                <property name="top_attach">1</property>
-+                                <property name="bottom_attach">2</property>
-+                                <property name="x_options">GTK_FILL</property>
-+                                <property name="y_options"></property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <object class="GtkLabel" id="label11">
-+                                <property name="visible">True</property>
-+                                <property name="xalign">0</property>
-+                                <property name="label" translatable="yes">Received:</property>
-+                              </object>
-+                              <packing>
-+                                <property name="x_options">GTK_FILL</property>
-+                                <property name="y_options"></property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <object class="GtkLabel" id="label12">
-+                                <property name="visible">True</property>
-+                                <property name="xalign">0</property>
-+                                <property name="label" translatable="yes">Sent:</property>
-+                              </object>
-+                              <packing>
-+                                <property name="top_attach">1</property>
-+                                <property name="bottom_attach">2</property>
-+                                <property name="x_options">GTK_FILL</property>
-+                                <property name="y_options"></property>
-+                              </packing>
-+                            </child>
-+                          </object>
-+                          <packing>
-+                            <property name="position">1</property>
-+                          </packing>
-+                        </child>
-+                      </object>
-+                      <packing>
-+                        <property name="position">1</property>
-+                      </packing>
-+                    </child>
-+                  </object>
-+                  <packing>
-+                    <property name="expand">False</property>
-+                    <property name="position">1</property>
-+                  </packing>
-+                </child>
-+                <child>
-+                  <object class="GtkVBox" id="signal_strength_frame">
-+                    <property name="visible">True</property>
-+                    <property name="spacing">6</property>
-+                    <child>
-+                      <object class="GtkLabel" id="label48">
-+                        <property name="visible">True</property>
-+                        <property name="xalign">0</property>
-+                        <property name="label" translatable="yes">&lt;b&gt;Signal Strength&lt;/b&gt;</property>
-+                        <property name="use_markup">True</property>
-+                      </object>
-+                      <packing>
-+                        <property name="expand">False</property>
-+                        <property name="fill">False</property>
-+                        <property name="position">0</property>
-+                      </packing>
-+                    </child>
-+                    <child>
-+                      <object class="GtkHBox" id="hbox14">
-+                        <property name="visible">True</property>
-+                        <child>
-+                          <object class="GtkLabel" id="label49">
-+                            <property name="visible">True</property>
-+                            <property name="label">    </property>
-+                          </object>
-+                          <packing>
-+                            <property name="expand">False</property>
-+                            <property name="fill">False</property>
-+                            <property name="position">0</property>
-+                          </packing>
-+                        </child>
-+                        <child>
-+                          <object class="GtkHBox" id="hbox15">
-+                            <property name="visible">True</property>
-+                            <property name="spacing">6</property>
-+                            <child>
-+                              <object class="GtkProgressBar" id="signal_strength_bar">
-+                                <property name="visible">True</property>
-+                                <property name="pulse_step">0.10000000149</property>
-+                              </object>
-+                              <packing>
-+                                <property name="position">0</property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <object class="GtkLabel" id="signal_strength_label">
-+                                <property name="visible">True</property>
-+                                <property name="label" translatable="yes">0%</property>
-+                              </object>
-+                              <packing>
-+                                <property name="expand">False</property>
-+                                <property name="position">1</property>
-+                              </packing>
-+                            </child>
-+                          </object>
-+                          <packing>
-+                            <property name="position">1</property>
-+                          </packing>
-+                        </child>
-+                      </object>
-+                      <packing>
-+                        <property name="expand">False</property>
-+                        <property name="position">1</property>
-+                      </packing>
-+                    </child>
-+                  </object>
-+                  <packing>
-+                    <property name="expand">False</property>
-+                    <property name="position">2</property>
-+                  </packing>
-+                </child>
-+              </object>
-+            </child>
-+            <child type="tab">
-+              <object class="GtkLabel" id="label1">
-+                <property name="visible">True</property>
-+                <property name="label" translatable="yes">General</property>
-+              </object>
-+              <packing>
-+                <property name="tab_fill">False</property>
-+              </packing>
-+            </child>
-+            <child>
-+              <object class="GtkVBox" id="vbox2">
-+                <property name="visible">True</property>
-+                <property name="border_width">12</property>
-+                <property name="spacing">18</property>
-+                <child>
-+                  <object class="GtkVBox" id="inet4_frame">
-+                    <property name="visible">True</property>
-+                    <property name="spacing">6</property>
-+                    <child>
-+                      <object class="GtkLabel" id="label25">
-+                        <property name="visible">True</property>
-+                        <property name="xalign">0</property>
-+                        <property name="label" translatable="yes">&lt;b&gt;Internet Protocol (IPv4)&lt;/b&gt;</property>
-+                        <property name="use_markup">True</property>
-+                      </object>
-+                      <packing>
-+                        <property name="expand">False</property>
-+                        <property name="fill">False</property>
-+                        <property name="position">0</property>
-+                      </packing>
-+                    </child>
-+                    <child>
-+                      <object class="GtkHBox" id="hbox11">
-+                        <property name="visible">True</property>
-+                        <child>
-+                          <object class="GtkLabel" id="label45">
-+                            <property name="visible">True</property>
-+                            <property name="label">    </property>
-+                          </object>
-+                          <packing>
-+                            <property name="expand">False</property>
-+                            <property name="fill">False</property>
-+                            <property name="position">0</property>
-+                          </packing>
-+                        </child>
-+                        <child>
-+                          <object class="GtkTable" id="inet4_table">
-+                            <property name="visible">True</property>
-+                            <property name="n_rows">4</property>
-+                            <property name="n_columns">2</property>
-+                            <property name="column_spacing">12</property>
-+                            <property name="row_spacing">6</property>
-+                            <child>
-+                              <object class="GtkLabel" id="inet4_addr_title">
-+                                <property name="visible">True</property>
-+                                <property name="xalign">0</property>
-+                                <property name="label" translatable="yes">Address:</property>
-+                              </object>
-+                              <packing>
-+                                <property name="x_options">GTK_FILL</property>
-+                                <property name="y_options"></property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <object class="GtkLabel" id="inet4_dest_title">
-+                                <property name="visible">True</property>
-+                                <property name="xalign">0</property>
-+                                <property name="label" translatable="yes">Destination:</property>
-+                              </object>
-+                              <packing>
-+                                <property name="top_attach">1</property>
-+                                <property name="bottom_attach">2</property>
-+                                <property name="x_options">GTK_FILL</property>
-+                                <property name="y_options"></property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <object class="GtkLabel" id="inet4_bcast_title">
-+                                <property name="visible">True</property>
-+                                <property name="xalign">0</property>
-+                                <property name="label" translatable="yes">Broadcast:</property>
-+                              </object>
-+                              <packing>
-+                                <property name="top_attach">2</property>
-+                                <property name="bottom_attach">3</property>
-+                                <property name="x_options">GTK_FILL</property>
-+                                <property name="y_options"></property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <object class="GtkLabel" id="inet4_mask_title">
-+                                <property name="visible">True</property>
-+                                <property name="xalign">0</property>
-+                                <property name="label" translatable="yes">Subnet Mask:</property>
-+                              </object>
-+                              <packing>
-+                                <property name="top_attach">3</property>
-+                                <property name="bottom_attach">4</property>
-+                                <property name="x_options">GTK_FILL</property>
-+                                <property name="y_options"></property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <object class="GtkLabel" id="inet4_addr_label">
-+                                <property name="visible">True</property>
-+                                <property name="can_focus">True</property>
-+                                <property name="xalign">0</property>
-+                                <property name="selectable">True</property>
-+                              </object>
-+                              <packing>
-+                                <property name="left_attach">1</property>
-+                                <property name="right_attach">2</property>
-+                                <property name="x_options">GTK_FILL</property>
-+                                <property name="y_options"></property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <object class="GtkLabel" id="inet4_dest_label">
-+                                <property name="visible">True</property>
-+                                <property name="can_focus">True</property>
-+                                <property name="xalign">0</property>
-+                                <property name="selectable">True</property>
-+                              </object>
-+                              <packing>
-+                                <property name="left_attach">1</property>
-+                                <property name="right_attach">2</property>
-+                                <property name="top_attach">1</property>
-+                                <property name="bottom_attach">2</property>
-+                                <property name="x_options">GTK_FILL</property>
-+                                <property name="y_options"></property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <object class="GtkLabel" id="inet4_bcast_label">
-+                                <property name="visible">True</property>
-+                                <property name="can_focus">True</property>
-+                                <property name="xalign">0</property>
-+                                <property name="selectable">True</property>
-+                              </object>
-+                              <packing>
-+                                <property name="left_attach">1</property>
-+                                <property name="right_attach">2</property>
-+                                <property name="top_attach">2</property>
-+                                <property name="bottom_attach">3</property>
-+                                <property name="x_options">GTK_FILL</property>
-+                                <property name="y_options"></property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <object class="GtkLabel" id="inet4_mask_label">
-+                                <property name="visible">True</property>
-+                                <property name="can_focus">True</property>
-+                                <property name="xalign">0</property>
-+                                <property name="selectable">True</property>
-+                              </object>
-+                              <packing>
-+                                <property name="left_attach">1</property>
-+                                <property name="right_attach">2</property>
-+                                <property name="top_attach">3</property>
-+                                <property name="bottom_attach">4</property>
-+                                <property name="x_options">GTK_FILL</property>
-+                                <property name="y_options"></property>
-+                              </packing>
-+                            </child>
-+                          </object>
-+                          <packing>
-+                            <property name="position">1</property>
-+                          </packing>
-+                        </child>
-+                      </object>
-+                      <packing>
-+                        <property name="position">1</property>
-+                      </packing>
-+                    </child>
-+                  </object>
-+                  <packing>
-+                    <property name="expand">False</property>
-+                    <property name="position">0</property>
-+                  </packing>
-+                </child>
-+                <child>
-+                  <object class="GtkVBox" id="inet6_frame">
-+                    <property name="spacing">6</property>
-+                    <child>
-+                      <object class="GtkLabel" id="label26">
-+                        <property name="visible">True</property>
-+                        <property name="xalign">0</property>
-+                        <property name="label" translatable="yes">&lt;b&gt;Internet Protocol (IPv6)&lt;/b&gt;</property>
-+                        <property name="use_markup">True</property>
-+                      </object>
-+                      <packing>
-+                        <property name="expand">False</property>
-+                        <property name="fill">False</property>
-+                        <property name="position">0</property>
-+                      </packing>
-+                    </child>
-+                    <child>
-+                      <object class="GtkHBox" id="hbox12">
-+                        <property name="visible">True</property>
-+                        <child>
-+                          <object class="GtkLabel" id="label46">
-+                            <property name="visible">True</property>
-+                            <property name="label">    </property>
-+                          </object>
-+                          <packing>
-+                            <property name="expand">False</property>
-+                            <property name="fill">False</property>
-+                            <property name="position">0</property>
-+                          </packing>
-+                        </child>
-+                        <child>
-+                          <object class="GtkTable" id="table5">
-+                            <property name="visible">True</property>
-+                            <property name="n_rows">2</property>
-+                            <property name="n_columns">2</property>
-+                            <property name="column_spacing">12</property>
-+                            <property name="row_spacing">6</property>
-+                            <child>
-+                              <object class="GtkLabel" id="label39">
-+                                <property name="visible">True</property>
-+                                <property name="xalign">0</property>
-+                                <property name="label" translatable="yes">Address:</property>
-+                              </object>
-+                              <packing>
-+                                <property name="x_options">GTK_FILL</property>
-+                                <property name="y_options"></property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <object class="GtkLabel" id="label40">
-+                                <property name="visible">True</property>
-+                                <property name="xalign">0</property>
-+                                <property name="label" translatable="yes">Scope:</property>
-+                              </object>
-+                              <packing>
-+                                <property name="top_attach">1</property>
-+                                <property name="bottom_attach">2</property>
-+                                <property name="x_options">GTK_FILL</property>
-+                                <property name="y_options"></property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <object class="GtkLabel" id="inet6_addr_label">
-+                                <property name="visible">True</property>
-+                                <property name="can_focus">True</property>
-+                                <property name="xalign">0</property>
-+                                <property name="selectable">True</property>
-+                              </object>
-+                              <packing>
-+                                <property name="left_attach">1</property>
-+                                <property name="right_attach">2</property>
-+                                <property name="x_options">GTK_FILL</property>
-+                                <property name="y_options"></property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <object class="GtkLabel" id="inet6_scope_label">
-+                                <property name="visible">True</property>
-+                                <property name="can_focus">True</property>
-+                                <property name="xalign">0</property>
-+                                <property name="selectable">True</property>
-+                              </object>
-+                              <packing>
-+                                <property name="left_attach">1</property>
-+                                <property name="right_attach">2</property>
-+                                <property name="top_attach">1</property>
-+                                <property name="bottom_attach">2</property>
-+                                <property name="x_options">GTK_FILL</property>
-+                                <property name="y_options"></property>
-+                              </packing>
-+                            </child>
-+                          </object>
-+                          <packing>
-+                            <property name="position">1</property>
-+                          </packing>
-+                        </child>
-+                      </object>
-+                      <packing>
-+                        <property name="position">1</property>
-+                      </packing>
-+                    </child>
-+                  </object>
-+                  <packing>
-+                    <property name="expand">False</property>
-+                    <property name="position">1</property>
-+                  </packing>
-+                </child>
-+                <child>
-+                  <object class="GtkVBox" id="dev_frame">
-+                    <property name="visible">True</property>
-+                    <property name="spacing">6</property>
-+                    <child>
-+                      <object class="GtkLabel" id="dev_label">
-+                        <property name="visible">True</property>
-+                        <property name="xalign">0</property>
-+                        <property name="label" translatable="yes">&lt;b&gt;Network Device&lt;/b&gt;</property>
-+                        <property name="use_markup">True</property>
-+                      </object>
-+                      <packing>
-+                        <property name="expand">False</property>
-+                        <property name="fill">False</property>
-+                        <property name="position">0</property>
-+                      </packing>
-+                    </child>
-+                    <child>
-+                      <object class="GtkHBox" id="hbox13">
-+                        <property name="visible">True</property>
-+                        <child>
-+                          <object class="GtkLabel" id="label47">
-+                            <property name="visible">True</property>
-+                            <property name="label">    </property>
-+                          </object>
-+                          <packing>
-+                            <property name="expand">False</property>
-+                            <property name="fill">False</property>
-+                            <property name="position">0</property>
-+                          </packing>
-+                        </child>
-+                        <child>
-+                          <object class="GtkTable" id="table6">
-+                            <property name="visible">True</property>
-+                            <property name="n_rows">2</property>
-+                            <property name="n_columns">2</property>
-+                            <property name="column_spacing">12</property>
-+                            <property name="row_spacing">6</property>
-+                            <child>
-+                              <object class="GtkLabel" id="dev_addr_title">
-+                                <property name="visible">True</property>
-+                                <property name="xalign">0</property>
-+                                <property name="label" translatable="yes">Address:</property>
-+                              </object>
-+                              <packing>
-+                                <property name="top_attach">1</property>
-+                                <property name="bottom_attach">2</property>
-+                                <property name="x_options">GTK_FILL</property>
-+                                <property name="y_options"></property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <object class="GtkLabel" id="dev_addr_label">
-+                                <property name="visible">True</property>
-+                                <property name="can_focus">True</property>
-+                                <property name="xalign">0</property>
-+                                <property name="selectable">True</property>
-+                              </object>
-+                              <packing>
-+                                <property name="left_attach">1</property>
-+                                <property name="right_attach">2</property>
-+                                <property name="top_attach">1</property>
-+                                <property name="bottom_attach">2</property>
-+                                <property name="x_options">GTK_FILL</property>
-+                                <property name="y_options"></property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <object class="GtkLabel" id="dev_type_label">
-+                                <property name="visible">True</property>
-+                                <property name="can_focus">True</property>
-+                                <property name="xalign">0</property>
-+                                <property name="selectable">True</property>
-+                              </object>
-+                              <packing>
-+                                <property name="left_attach">1</property>
-+                                <property name="right_attach">2</property>
-+                                <property name="x_options">GTK_FILL</property>
-+                                <property name="y_options"></property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <object class="GtkLabel" id="dev_type_title">
-+                                <property name="visible">True</property>
-+                                <property name="xalign">0</property>
-+                                <property name="label" translatable="yes">Type:</property>
-+                              </object>
-+                              <packing>
-+                                <property name="x_options">GTK_FILL</property>
-+                                <property name="y_options"></property>
-+                              </packing>
-+                            </child>
-+                          </object>
-+                          <packing>
-+                            <property name="position">1</property>
-+                          </packing>
-+                        </child>
-+                      </object>
-+                      <packing>
-+                        <property name="position">1</property>
-+                      </packing>
-+                    </child>
-+                  </object>
-+                  <packing>
-+                    <property name="expand">False</property>
-+                    <property name="position">2</property>
-+                  </packing>
-+                </child>
-+              </object>
-+              <packing>
-+                <property name="position">1</property>
-+              </packing>
-+            </child>
-+            <child type="tab">
-+              <object class="GtkLabel" id="label2">
-+                <property name="visible">True</property>
-+                <property name="label" translatable="yes">Support</property>
-+              </object>
-+              <packing>
-+                <property name="position">1</property>
-+                <property name="tab_fill">False</property>
-+              </packing>
-+            </child>
-+          </object>
-+          <packing>
-+            <property name="position">1</property>
-+          </packing>
-+        </child>
-+        <child internal-child="action_area">
-+          <object class="GtkHButtonBox" id="dialog-action_area2">
-+            <property name="visible">True</property>
-+            <property name="layout_style">end</property>
-+            <child>
-+              <object class="GtkButton" id="helpbutton1">
-+                <property name="label">gtk-help</property>
-+                <property name="can_focus">True</property>
-+                <property name="can_default">True</property>
-+                <property name="has_default">True</property>
-+                <property name="receives_default">False</property>
-+                <property name="use_stock">True</property>
-+              </object>
-+              <packing>
-+                <property name="expand">False</property>
-+                <property name="fill">False</property>
-+                <property name="position">0</property>
-+              </packing>
-+            </child>
-+            <child>
-+              <object class="GtkButton" id="configure_button">
-+                <property name="visible">True</property>
-+                <property name="can_focus">True</property>
-+                <property name="can_default">True</property>
-+                <property name="receives_default">False</property>
-+                <child>
-+                  <object class="GtkAlignment" id="alignment2">
-+                    <property name="visible">True</property>
-+                    <property name="xscale">0</property>
-+                    <property name="yscale">0</property>
-+                    <child>
-+                      <object class="GtkHBox" id="hbox5">
-+                        <property name="visible">True</property>
-+                        <property name="spacing">2</property>
-+                        <child>
-+                          <object class="GtkImage" id="image2">
-+                            <property name="visible">True</property>
-+                            <property name="stock">gtk-preferences</property>
-+                          </object>
-+                          <packing>
-+                            <property name="expand">False</property>
-+                            <property name="fill">False</property>
-+                            <property name="position">0</property>
-+                          </packing>
-+                        </child>
-+                        <child>
-+                          <object class="GtkLabel" id="label42">
-+                            <property name="visible">True</property>
-+                            <property name="label" translatable="yes">Con_figure</property>
-+                            <property name="use_underline">True</property>
-+                          </object>
-+                          <packing>
-+                            <property name="expand">False</property>
-+                            <property name="fill">False</property>
-+                            <property name="position">1</property>
-+                          </packing>
-+                        </child>
-+                      </object>
-+                    </child>
-+                  </object>
-+                </child>
-+              </object>
-+              <packing>
-+                <property name="expand">False</property>
-+                <property name="fill">False</property>
-+                <property name="position">1</property>
-+              </packing>
-+            </child>
-+            <child>
-+              <object class="GtkButton" id="close_button">
-+                <property name="label">gtk-close</property>
-+                <property name="visible">True</property>
-+                <property name="can_focus">True</property>
-+                <property name="can_default">True</property>
-+                <property name="has_default">True</property>
-+                <property name="receives_default">False</property>
-+                <property name="use_stock">True</property>
-+              </object>
-+              <packing>
-+                <property name="expand">False</property>
-+                <property name="fill">False</property>
-+                <property name="position">2</property>
-+              </packing>
-+            </child>
-+          </object>
-+          <packing>
-+            <property name="expand">False</property>
-+            <property name="pack_type">end</property>
-+            <property name="position">0</property>
-+          </packing>
-+        </child>
-+      </object>
-+    </child>
-+    <action-widgets>
-+      <action-widget response="-11">helpbutton1</action-widget>
-+      <action-widget response="0">configure_button</action-widget>
-+      <action-widget response="-7">close_button</action-widget>
-+    </action-widgets>
-+  </object>
-+</interface>
---- a/data/ui/netstatus.ui
-+++ /dev/null
-@@ -1 +0,0 @@
--<?xml version="1.0"?><interface><requires lib="gtk+" version="2.16"/><object class="GtkDialog" id="network_status_dialog"><property name="border_width">5</property><property name="resizable">False</property><property name="window_position">center</property><property name="default_width">300</property><property name="type_hint">dialog</property><property name="has_separator">False</property><child internal-child="vbox"><object class="GtkVBox" id="dialog-vbox2"><property name="visible">True</property><property name="spacing">2</property><child><object class="GtkNotebook" id="notebook1"><property name="visible">True</property><property name="can_focus">True</property><property name="border_width">5</property><child><object class="GtkVBox" id="vbox1"><property name="visible">True</property><property name="border_width">12</property><property name="spacing">18</property><child><object class="GtkVBox" id="connection_frame"><property name="visible">True</property><property name="spacing">6</property><child><object class="GtkLabel" id="label3"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">&lt;b&gt;Connection&lt;/b&gt;</property><property name="use_markup">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkHBox" id="hbox6"><property name="visible">True</property><child><object class="GtkLabel" id="label43"><property name="visible">True</property><property name="label"></property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkHBox" id="connection_hbox"><property name="visible">True</property><property name="spacing">12</property><child><object class="GtkTable" id="connection_table"><property name="visible">True</property><property name="n_rows">2</property><property name="n_columns">2</property><property name="column_spacing">12</property><property name="row_spacing">6</property><child><object class="GtkLabel" id="label5"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Status:</property></object><packing><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="status_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="label16"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">_Name:</property><property name="use_underline">True</property></object><packing><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkComboBoxEntry" id="name_combo"><property name="visible">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="x_options"></property><property name="y_options"></property></packing></child></object><packing><property name="position">0</property></packing></child><child><placeholder/></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="position">0</property></packing></child><child><object class="GtkVBox" id="activity_frame"><property name="visible">True</property><property name="spacing">6</property><child><object class="GtkLabel" id="label4"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">&lt;b&gt;Activity&lt;/b&gt;</property><property name="use_markup">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkHBox" id="hbox8"><property name="visible">True</property><child><object class="GtkLabel" id="label44"><property name="visible">True</property><property name="label"></property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkTable" id="table2"><property name="visible">True</property><property name="n_rows">2</property><property name="n_columns">2</property><property name="column_spacing">12</property><property name="row_spacing">6</property><child><object class="GtkLabel" id="received_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="sent_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="label11"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Received:</property></object><packing><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="label12"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Sent:</property></object><packing><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="position">1</property></packing></child><child><object class="GtkVBox" id="signal_strength_frame"><property name="visible">True</property><property name="spacing">6</property><child><object class="GtkLabel" id="label48"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">&lt;b&gt;Signal Strength&lt;/b&gt;</property><property name="use_markup">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkHBox" id="hbox14"><property name="visible">True</property><child><object class="GtkLabel" id="label49"><property name="visible">True</property><property name="label"></property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkHBox" id="hbox15"><property name="visible">True</property><property name="spacing">6</property><child><object class="GtkProgressBar" id="signal_strength_bar"><property name="visible">True</property><property name="pulse_step">0.10000000149</property></object><packing><property name="position">0</property></packing></child><child><object class="GtkLabel" id="signal_strength_label"><property name="visible">True</property><property name="label" translatable="yes">0%</property></object><packing><property name="expand">False</property><property name="position">1</property></packing></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="position">2</property></packing></child></object></child><child type="tab"><object class="GtkLabel" id="label1"><property name="visible">True</property><property name="label" translatable="yes">General</property></object><packing><property name="tab_fill">False</property></packing></child><child><object class="GtkVBox" id="vbox2"><property name="visible">True</property><property name="border_width">12</property><property name="spacing">18</property><child><object class="GtkVBox" id="inet4_frame"><property name="visible">True</property><property name="spacing">6</property><child><object class="GtkLabel" id="label25"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">&lt;b&gt;Internet Protocol (IPv4)&lt;/b&gt;</property><property name="use_markup">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkHBox" id="hbox11"><property name="visible">True</property><child><object class="GtkLabel" id="label45"><property name="visible">True</property><property name="label"></property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkTable" id="inet4_table"><property name="visible">True</property><property name="n_rows">4</property><property name="n_columns">2</property><property name="column_spacing">12</property><property name="row_spacing">6</property><child><object class="GtkLabel" id="inet4_addr_title"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Address:</property></object><packing><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="inet4_dest_title"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Destination:</property></object><packing><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="inet4_bcast_title"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Broadcast:</property></object><packing><property name="top_attach">2</property><property name="bottom_attach">3</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="inet4_mask_title"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Subnet Mask:</property></object><packing><property name="top_attach">3</property><property name="bottom_attach">4</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="inet4_addr_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="inet4_dest_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="inet4_bcast_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">2</property><property name="bottom_attach">3</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="inet4_mask_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">3</property><property name="bottom_attach">4</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="position">0</property></packing></child><child><object class="GtkVBox" id="inet6_frame"><property name="spacing">6</property><child><object class="GtkLabel" id="label26"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">&lt;b&gt;Internet Protocol (IPv6)&lt;/b&gt;</property><property name="use_markup">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkHBox" id="hbox12"><property name="visible">True</property><child><object class="GtkLabel" id="label46"><property name="visible">True</property><property name="label"></property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkTable" id="table5"><property name="visible">True</property><property name="n_rows">2</property><property name="n_columns">2</property><property name="column_spacing">12</property><property name="row_spacing">6</property><child><object class="GtkLabel" id="label39"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Address:</property></object><packing><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="label40"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Scope:</property></object><packing><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="inet6_addr_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="inet6_scope_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="position">1</property></packing></child><child><object class="GtkVBox" id="dev_frame"><property name="visible">True</property><property name="spacing">6</property><child><object class="GtkLabel" id="dev_label"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">&lt;b&gt;Network Device&lt;/b&gt;</property><property name="use_markup">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkHBox" id="hbox13"><property name="visible">True</property><child><object class="GtkLabel" id="label47"><property name="visible">True</property><property name="label"></property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkTable" id="table6"><property name="visible">True</property><property name="n_rows">2</property><property name="n_columns">2</property><property name="column_spacing">12</property><property name="row_spacing">6</property><child><object class="GtkLabel" id="dev_addr_title"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Address:</property></object><packing><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="dev_addr_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="dev_type_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="dev_type_title"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Type:</property></object><packing><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="position">2</property></packing></child></object><packing><property name="position">1</property></packing></child><child type="tab"><object class="GtkLabel" id="label2"><property name="visible">True</property><property name="label" translatable="yes">Support</property></object><packing><property name="position">1</property><property name="tab_fill">False</property></packing></child></object><packing><property name="position">1</property></packing></child><child internal-child="action_area"><object class="GtkHButtonBox" id="dialog-action_area2"><property name="visible">True</property><property name="layout_style">end</property><child><object class="GtkButton" id="helpbutton1"><property name="label">gtk-help</property><property name="can_focus">True</property><property name="can_default">True</property><property name="has_default">True</property><property name="receives_default">False</property><property name="use_stock">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkButton" id="configure_button"><property name="visible">True</property><property name="can_focus">True</property><property name="can_default">True</property><property name="receives_default">False</property><child><object class="GtkAlignment" id="alignment2"><property name="visible">True</property><property name="xscale">0</property><property name="yscale">0</property><child><object class="GtkHBox" id="hbox5"><property name="visible">True</property><property name="spacing">2</property><child><object class="GtkImage" id="image2"><property name="visible">True</property><property name="stock">gtk-preferences</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkLabel" id="label42"><property name="visible">True</property><property name="label" translatable="yes">Con_figure</property><property name="use_underline">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">1</property></packing></child></object></child></object></child></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">1</property></packing></child><child><object class="GtkButton" id="close_button"><property name="label">gtk-close</property><property name="visible">True</property><property name="can_focus">True</property><property name="can_default">True</property><property name="has_default">True</property><property name="receives_default">False</property><property name="use_stock">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">2</property></packing></child></object><packing><property name="expand">False</property><property name="pack_type">end</property><property name="position">0</property></packing></child></object></child><action-widgets><action-widget response="-11">helpbutton1</action-widget><action-widget response="0">configure_button</action-widget><action-widget response="-7">close_button</action-widget></action-widgets></object></interface>
---- /dev/null
-+++ b/data/ui/panel-pref.glade
-@@ -0,0 +1,1109 @@
-+<?xml version="1.0"?>
-+<interface>
-+  <!-- interface-requires gtk+ 2.12 -->
-+  <!-- interface-naming-policy toplevel-contextual -->
-+  <object class="GtkListStore" id="liststore1">
-+    <columns>
-+      <!-- column-name item -->
-+      <column type="gchararray"/>
-+    </columns>
-+    <data>
-+      <row>
-+        <col id="0" translatable="yes">Dynamic</col>
-+      </row>
-+      <row>
-+        <col id="0" translatable="yes">Pixels</col>
-+      </row>
-+      <row>
-+        <col id="0" translatable="yes">% Percent</col>
-+      </row>
-+    </data>
-+  </object>
-+  <object class="GtkListStore" id="liststore2">
-+    <columns>
-+      <!-- column-name item -->
-+      <column type="gchararray"/>
-+    </columns>
-+    <data>
-+      <row>
-+        <col id="0" translatable="yes">Pixels</col>
-+      </row>
-+    </data>
-+  </object>
-+  <object class="GtkDialog" id="panel_pref">
-+    <property name="visible">True</property>
-+    <property name="title" translatable="yes">Panel Preferences</property>
-+    <property name="type_hint">dialog</property>
-+    <child internal-child="vbox">
-+      <object class="GtkVBox" id="dialog-vbox1">
-+        <property name="visible">True</property>
-+        <child>
-+          <object class="GtkNotebook" id="notebook">
-+            <property name="visible">True</property>
-+            <property name="can_focus">True</property>
-+            <child>
-+              <object class="GtkHBox" id="hbox6">
-+                <property name="visible">True</property>
-+                <property name="border_width">6</property>
-+                <child>
-+                  <object class="GtkFrame" id="frame1">
-+                    <property name="visible">True</property>
-+                    <property name="label_xalign">0</property>
-+                    <property name="shadow_type">none</property>
-+                    <child>
-+                      <object class="GtkAlignment" id="alignment1">
-+                        <property name="visible">True</property>
-+                        <property name="left_padding">8</property>
-+                        <child>
-+                          <object class="GtkTable" id="table1">
-+                            <property name="visible">True</property>
-+                            <property name="n_rows">3</property>
-+                            <property name="n_columns">2</property>
-+                            <property name="row_spacing">2</property>
-+                            <child>
-+                              <object class="GtkLabel" id="label7">
-+                                <property name="visible">True</property>
-+                                <property name="xalign">0</property>
-+                                <property name="label" translatable="yes">Edge:</property>
-+                              </object>
-+                              <packing>
-+                                <property name="x_options"></property>
-+                                <property name="y_options"></property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <object class="GtkLabel" id="label8">
-+                                <property name="visible">True</property>
-+                                <property name="xalign">0</property>
-+                                <property name="label" translatable="yes">Alignment:</property>
-+                              </object>
-+                              <packing>
-+                                <property name="top_attach">1</property>
-+                                <property name="bottom_attach">2</property>
-+                                <property name="x_options"></property>
-+                                <property name="y_options"></property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <object class="GtkLabel" id="label9">
-+                                <property name="visible">True</property>
-+                                <property name="xalign">0</property>
-+                                <property name="label" translatable="yes">Margin:</property>
-+                              </object>
-+                              <packing>
-+                                <property name="top_attach">2</property>
-+                                <property name="bottom_attach">3</property>
-+                                <property name="x_options"></property>
-+                                <property name="y_options"></property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <object class="GtkSpinButton" id="margin">
-+                                <property name="visible">True</property>
-+                                <property name="can_focus">True</property>
-+                                <property name="invisible_char">&#x2022;</property>
-+                                <property name="adjustment">adjustment4</property>
-+                                <property name="climb_rate">1</property>
-+                              </object>
-+                              <packing>
-+                                <property name="left_attach">1</property>
-+                                <property name="right_attach">2</property>
-+                                <property name="top_attach">2</property>
-+                                <property name="bottom_attach">3</property>
-+                                <property name="x_options"></property>
-+                                <property name="y_options"></property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <object class="GtkVBox" id="vbox7">
-+                                <property name="visible">True</property>
-+                                <property name="orientation">vertical</property>
-+                                <child>
-+                                  <object class="GtkRadioButton" id="edge_bottom">
-+                                    <property name="label" translatable="yes">Bottom</property>
-+                                    <property name="visible">True</property>
-+                                    <property name="can_focus">True</property>
-+                                    <property name="receives_default">False</property>
-+                                    <property name="active">True</property>
-+                                    <property name="draw_indicator">True</property>
-+                                  </object>
-+                                  <packing>
-+                                    <property name="position">0</property>
-+                                  </packing>
-+                                </child>
-+                                <child>
-+                                  <object class="GtkRadioButton" id="edge_top">
-+                                    <property name="label" translatable="yes">Top</property>
-+                                    <property name="visible">True</property>
-+                                    <property name="can_focus">True</property>
-+                                    <property name="receives_default">False</property>
-+                                    <property name="draw_indicator">True</property>
-+                                    <property name="group">edge_bottom</property>
-+                                  </object>
-+                                  <packing>
-+                                    <property name="position">1</property>
-+                                  </packing>
-+                                </child>
-+                                <child>
-+                                  <object class="GtkRadioButton" id="edge_left">
-+                                    <property name="label" translatable="yes">Left</property>
-+                                    <property name="visible">True</property>
-+                                    <property name="can_focus">True</property>
-+                                    <property name="receives_default">False</property>
-+                                    <property name="draw_indicator">True</property>
-+                                    <property name="group">edge_bottom</property>
-+                                  </object>
-+                                  <packing>
-+                                    <property name="position">2</property>
-+                                  </packing>
-+                                </child>
-+                                <child>
-+                                  <object class="GtkRadioButton" id="edge_right">
-+                                    <property name="label" translatable="yes">Right</property>
-+                                    <property name="visible">True</property>
-+                                    <property name="can_focus">True</property>
-+                                    <property name="receives_default">False</property>
-+                                    <property name="draw_indicator">True</property>
-+                                    <property name="group">edge_bottom</property>
-+                                  </object>
-+                                  <packing>
-+                                    <property name="position">3</property>
-+                                  </packing>
-+                                </child>
-+                              </object>
-+                              <packing>
-+                                <property name="left_attach">1</property>
-+                                <property name="right_attach">2</property>
-+                                <property name="y_options">GTK_FILL</property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <object class="GtkVBox" id="vbox9">
-+                                <property name="visible">True</property>
-+                                <property name="orientation">vertical</property>
-+                                <child>
-+                                  <object class="GtkRadioButton" id="alignment_left">
-+                                    <property name="label" translatable="yes">Left</property>
-+                                    <property name="visible">True</property>
-+                                    <property name="can_focus">True</property>
-+                                    <property name="receives_default">False</property>
-+                                    <property name="active">True</property>
-+                                    <property name="draw_indicator">True</property>
-+                                  </object>
-+                                  <packing>
-+                                    <property name="position">0</property>
-+                                  </packing>
-+                                </child>
-+                                <child>
-+                                  <object class="GtkRadioButton" id="alignment_center">
-+                                    <property name="label" translatable="yes">Center</property>
-+                                    <property name="visible">True</property>
-+                                    <property name="can_focus">True</property>
-+                                    <property name="receives_default">False</property>
-+                                    <property name="draw_indicator">True</property>
-+                                    <property name="group">alignment_left</property>
-+                                  </object>
-+                                  <packing>
-+                                    <property name="position">1</property>
-+                                  </packing>
-+                                </child>
-+                                <child>
-+                                  <object class="GtkRadioButton" id="alignment_right">
-+                                    <property name="label" translatable="yes">Right</property>
-+                                    <property name="visible">True</property>
-+                                    <property name="can_focus">True</property>
-+                                    <property name="receives_default">False</property>
-+                                    <property name="draw_indicator">True</property>
-+                                    <property name="group">alignment_left</property>
-+                                  </object>
-+                                  <packing>
-+                                    <property name="position">2</property>
-+                                  </packing>
-+                                </child>
-+                              </object>
-+                              <packing>
-+                                <property name="left_attach">1</property>
-+                                <property name="right_attach">2</property>
-+                                <property name="top_attach">1</property>
-+                                <property name="bottom_attach">2</property>
-+                                <property name="y_options">GTK_FILL</property>
-+                              </packing>
-+                            </child>
-+                          </object>
-+                        </child>
-+                      </object>
-+                    </child>
-+                    <child type="label">
-+                      <object class="GtkLabel" id="label5">
-+                        <property name="visible">True</property>
-+                        <property name="label" translatable="yes">&lt;b&gt;Position&lt;/b&gt;</property>
-+                        <property name="use_markup">True</property>
-+                      </object>
-+                    </child>
-+                  </object>
-+                  <packing>
-+                    <property name="position">0</property>
-+                  </packing>
-+                </child>
-+                <child>
-+                  <object class="GtkFrame" id="frame2">
-+                    <property name="visible">True</property>
-+                    <property name="label_xalign">0</property>
-+                    <property name="shadow_type">none</property>
-+                    <child>
-+                      <object class="GtkAlignment" id="alignment2">
-+                        <property name="visible">True</property>
-+                        <property name="left_padding">8</property>
-+                        <child>
-+                          <object class="GtkTable" id="table2">
-+                            <property name="visible">True</property>
-+                            <property name="n_rows">3</property>
-+                            <property name="n_columns">3</property>
-+                            <property name="row_spacing">2</property>
-+                            <child>
-+                              <object class="GtkLabel" id="width_label">
-+                                <property name="visible">True</property>
-+                                <property name="xalign">0</property>
-+                                <property name="label" translatable="yes">Width:</property>
-+                              </object>
-+                              <packing>
-+                                <property name="x_options"></property>
-+                                <property name="y_options"></property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <object class="GtkLabel" id="height_label">
-+                                <property name="visible">True</property>
-+                                <property name="xalign">0</property>
-+                                <property name="label" translatable="yes">Height:</property>
-+                              </object>
-+                              <packing>
-+                                <property name="top_attach">1</property>
-+                                <property name="bottom_attach">2</property>
-+                                <property name="x_options"></property>
-+                                <property name="y_options"></property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <object class="GtkComboBox" id="height_unit">
-+                                <property name="visible">True</property>
-+                                <property name="model">liststore2</property>
-+                                <child>
-+                                  <object class="GtkCellRendererText" id="cellrenderertext2"/>
-+                                  <attributes>
-+                                    <attribute name="text">0</attribute>
-+                                  </attributes>
-+                                </child>
-+                              </object>
-+                              <packing>
-+                                <property name="left_attach">2</property>
-+                                <property name="right_attach">3</property>
-+                                <property name="top_attach">1</property>
-+                                <property name="bottom_attach">2</property>
-+                                <property name="x_options"></property>
-+                                <property name="y_options"></property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <object class="GtkSpinButton" id="width">
-+                                <property name="visible">True</property>
-+                                <property name="can_focus">True</property>
-+                                <property name="invisible_char">&#x2022;</property>
-+                                <property name="adjustment">adjustment3</property>
-+                                <property name="climb_rate">1</property>
-+                              </object>
-+                              <packing>
-+                                <property name="left_attach">1</property>
-+                                <property name="right_attach">2</property>
-+                                <property name="x_options"></property>
-+                                <property name="y_options"></property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <object class="GtkSpinButton" id="height">
-+                                <property name="visible">True</property>
-+                                <property name="can_focus">True</property>
-+                                <property name="invisible_char">&#x2022;</property>
-+                                <property name="adjustment">adjustment2</property>
-+                                <property name="climb_rate">1</property>
-+                              </object>
-+                              <packing>
-+                                <property name="left_attach">1</property>
-+                                <property name="right_attach">2</property>
-+                                <property name="top_attach">1</property>
-+                                <property name="bottom_attach">2</property>
-+                                <property name="x_options"></property>
-+                                <property name="y_options"></property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <object class="GtkComboBox" id="width_unit">
-+                                <property name="visible">True</property>
-+                                <property name="model">liststore1</property>
-+                                <child>
-+                                  <object class="GtkCellRendererText" id="cellrenderertext1"/>
-+                                  <attributes>
-+                                    <attribute name="text">0</attribute>
-+                                  </attributes>
-+                                </child>
-+                              </object>
-+                              <packing>
-+                                <property name="left_attach">2</property>
-+                                <property name="right_attach">3</property>
-+                                <property name="x_options"></property>
-+                                <property name="y_options"></property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <object class="GtkLabel" id="label11">
-+                                <property name="visible">True</property>
-+                                <property name="label" translatable="yes">&lt;b&gt;Icon&lt;/b&gt;</property>
-+                                <property name="use_markup">True</property>
-+                              </object>
-+                              <packing>
-+                                <property name="top_attach">2</property>
-+                                <property name="bottom_attach">3</property>
-+                                <property name="y_options"></property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <object class="GtkSpinButton" id="icon_size">
-+                                <property name="visible">True</property>
-+                                <property name="can_focus">True</property>
-+                                <property name="invisible_char">&#x2022;</property>
-+                                <property name="adjustment">adjustment5</property>
-+                                <property name="climb_rate">1</property>
-+                              </object>
-+                              <packing>
-+                                <property name="left_attach">1</property>
-+                                <property name="right_attach">2</property>
-+                                <property name="top_attach">2</property>
-+                                <property name="bottom_attach">3</property>
-+                                <property name="x_options"></property>
-+                                <property name="y_options">GTK_SHRINK</property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <object class="GtkLabel" id="label14">
-+                                <property name="visible">True</property>
-+                                <property name="label" translatable="yes">pixels</property>
-+                              </object>
-+                              <packing>
-+                                <property name="left_attach">2</property>
-+                                <property name="right_attach">3</property>
-+                                <property name="top_attach">2</property>
-+                                <property name="bottom_attach">3</property>
-+                              </packing>
-+                            </child>
-+                          </object>
-+                        </child>
-+                      </object>
-+                    </child>
-+                    <child type="label">
-+                      <object class="GtkLabel" id="label6">
-+                        <property name="visible">True</property>
-+                        <property name="label" translatable="yes">&lt;b&gt;Size&lt;/b&gt;</property>
-+                        <property name="use_markup">True</property>
-+                      </object>
-+                    </child>
-+                  </object>
-+                  <packing>
-+                    <property name="position">1</property>
-+                  </packing>
-+                </child>
-+              </object>
-+            </child>
-+            <child type="tab">
-+              <object class="GtkLabel" id="label1">
-+                <property name="visible">True</property>
-+                <property name="label" translatable="yes">Geometry</property>
-+              </object>
-+              <packing>
-+                <property name="tab_fill">False</property>
-+              </packing>
-+            </child>
-+            <child>
-+              <object class="GtkVBox" id="vbox1">
-+                <property name="visible">True</property>
-+                <property name="border_width">6</property>
-+                <property name="spacing">4</property>
-+                <child>
-+                  <object class="GtkFrame" id="frame4">
-+                    <property name="visible">True</property>
-+                    <property name="label_xalign">0</property>
-+                    <property name="shadow_type">none</property>
-+                    <child>
-+                      <object class="GtkAlignment" id="alignment4">
-+                        <property name="visible">True</property>
-+                        <property name="left_padding">8</property>
-+                        <child>
-+                          <object class="GtkVBox" id="vbox4">
-+                            <property name="visible">True</property>
-+                            <property name="orientation">vertical</property>
-+                            <property name="spacing">2</property>
-+                            <child>
-+                              <object class="GtkRadioButton" id="bg_none">
-+                                <property name="label" translatable="yes">System theme</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="active">True</property>
-+                                <property name="draw_indicator">True</property>
-+                              </object>
-+                              <packing>
-+                                <property name="expand">False</property>
-+                                <property name="fill">False</property>
-+                                <property name="position">0</property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <object class="GtkHBox" id="hbox2">
-+                                <property name="visible">True</property>
-+                                <property name="spacing">10</property>
-+                                <child>
-+                                  <object class="GtkRadioButton" id="bg_transparency">
-+                                    <property name="label" translatable="yes">Solid color (with opacity)</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>
-+                                    <property name="group">bg_none</property>
-+                                  </object>
-+                                  <packing>
-+                                    <property name="expand">False</property>
-+                                    <property name="fill">False</property>
-+                                    <property name="position">0</property>
-+                                  </packing>
-+                                </child>
-+                                <child>
-+                                  <object class="GtkColorButton" id="tint_clr">
-+                                    <property name="visible">True</property>
-+                                    <property name="can_focus">True</property>
-+                                    <property name="receives_default">True</property>
-+                                    <property name="use_alpha">True</property>
-+                                    <property name="color">#000000000000</property>
-+                                  </object>
-+                                  <packing>
-+                                    <property name="expand">False</property>
-+                                    <property name="fill">False</property>
-+                                    <property name="position">1</property>
-+                                  </packing>
-+                                </child>
-+                              </object>
-+                              <packing>
-+                                <property name="expand">False</property>
-+                                <property name="fill">False</property>
-+                                <property name="position">1</property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <object class="GtkHBox" id="hbox4">
-+                                <property name="visible">True</property>
-+                                <property name="spacing">40</property>
-+                                <child>
-+                                  <object class="GtkRadioButton" id="bg_image">
-+                                    <property name="label" translatable="yes">Image</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>
-+                                    <property name="group">bg_none</property>
-+                                  </object>
-+                                  <packing>
-+                                    <property name="expand">False</property>
-+                                    <property name="fill">False</property>
-+                                    <property name="position">0</property>
-+                                  </packing>
-+                                </child>
-+                                <child>
-+                                  <object class="GtkFileChooserButton" id="img_file">
-+                                    <property name="visible">True</property>
-+                                    <property name="title" translatable="yes">Select an image file</property>
-+                                  </object>
-+                                  <packing>
-+                                    <property name="position">1</property>
-+                                  </packing>
-+                                </child>
-+                              </object>
-+                              <packing>
-+                                <property name="expand">False</property>
-+                                <property name="fill">False</property>
-+                                <property name="position">2</property>
-+                              </packing>
-+                            </child>
-+                          </object>
-+                        </child>
-+                      </object>
-+                    </child>
-+                    <child type="label">
-+                      <object class="GtkLabel" id="label18">
-+                        <property name="visible">True</property>
-+                        <property name="label" translatable="yes">&lt;b&gt;Background&lt;/b&gt;</property>
-+                        <property name="use_markup">True</property>
-+                      </object>
-+                    </child>
-+                  </object>
-+                  <packing>
-+                    <property name="expand">False</property>
-+                    <property name="position">0</property>
-+                  </packing>
-+                </child>
-+                <child>
-+                  <object class="GtkFrame" id="frame5">
-+                    <property name="visible">True</property>
-+                    <property name="label_xalign">0</property>
-+                    <property name="shadow_type">none</property>
-+                    <child>
-+                      <object class="GtkAlignment" id="alignment5">
-+                        <property name="visible">True</property>
-+                        <property name="left_padding">8</property>
-+                        <child>
-+                          <object class="GtkHBox" id="hbox1">
-+                            <property name="visible">True</property>
-+                            <property name="spacing">10</property>
-+                            <child>
-+                              <object class="GtkCheckButton" id="use_font_clr">
-+                                <property name="label" translatable="yes">Custom color</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>
-+                              </object>
-+                              <packing>
-+                                <property name="expand">False</property>
-+                                <property name="fill">False</property>
-+                                <property name="position">0</property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <object class="GtkColorButton" id="font_clr">
-+                                <property name="visible">True</property>
-+                                <property name="can_focus">True</property>
-+                                <property name="receives_default">True</property>
-+                                <property name="color">#000000000000</property>
-+                              </object>
-+                              <packing>
-+                                <property name="expand">False</property>
-+                                <property name="fill">False</property>
-+                                <property name="position">1</property>
-+                              </packing>
-+                            </child>
-+                          </object>
-+                        </child>
-+                      </object>
-+                    </child>
-+                    <child type="label">
-+                      <object class="GtkLabel" id="label19">
-+                        <property name="visible">True</property>
-+                        <property name="label" translatable="yes">&lt;b&gt;Font&lt;/b&gt;</property>
-+                        <property name="use_markup">True</property>
-+                      </object>
-+                    </child>
-+                  </object>
-+                  <packing>
-+                    <property name="expand">False</property>
-+                    <property name="position">1</property>
-+                  </packing>
-+                </child>
-+              </object>
-+              <packing>
-+                <property name="position">1</property>
-+              </packing>
-+            </child>
-+            <child type="tab">
-+              <object class="GtkLabel" id="label10">
-+                <property name="visible">True</property>
-+                <property name="label" translatable="yes">Appearance</property>
-+              </object>
-+              <packing>
-+                <property name="position">1</property>
-+                <property name="tab_fill">False</property>
-+              </packing>
-+            </child>
-+            <child>
-+              <object class="GtkHBox" id="hbox5">
-+                <property name="visible">True</property>
-+                <property name="spacing">2</property>
-+                <child>
-+                  <object class="GtkVBox" id="vbox5">
-+                    <property name="visible">True</property>
-+                    <child>
-+                      <object class="GtkScrolledWindow" id="scrolledwindow1">
-+                        <property name="visible">True</property>
-+                        <property name="can_focus">True</property>
-+                        <property name="hscrollbar_policy">automatic</property>
-+                        <property name="vscrollbar_policy">automatic</property>
-+                        <property name="shadow_type">in</property>
-+                        <child>
-+                          <object class="GtkTreeView" id="plugin_list">
-+                            <property name="visible">True</property>
-+                            <property name="can_focus">True</property>
-+                            <property name="rules_hint">True</property>
-+                          </object>
-+                        </child>
-+                      </object>
-+                      <packing>
-+                        <property name="position">0</property>
-+                      </packing>
-+                    </child>
-+                    <child>
-+                      <object class="GtkLabel" id="plugin_desc">
-+                        <property name="visible">True</property>
-+                        <property name="can_focus">True</property>
-+                        <property name="xalign">0</property>
-+                        <property name="wrap">True</property>
-+                        <property name="selectable">True</property>
-+                        <property name="ellipsize">end</property>
-+                      </object>
-+                      <packing>
-+                        <property name="expand">False</property>
-+                        <property name="fill">False</property>
-+                        <property name="position">1</property>
-+                      </packing>
-+                    </child>
-+                  </object>
-+                  <packing>
-+                    <property name="position">0</property>
-+                  </packing>
-+                </child>
-+                <child>
-+                  <object class="GtkVBox" id="vbox6">
-+                    <property name="visible">True</property>
-+                    <property name="border_width">2</property>
-+                    <property name="spacing">2</property>
-+                    <child>
-+                      <object class="GtkButton" id="add_btn">
-+                        <property name="label">gtk-add</property>
-+                        <property name="visible">True</property>
-+                        <property name="can_focus">True</property>
-+                        <property name="receives_default">False</property>
-+                        <property name="use_stock">True</property>
-+                      </object>
-+                      <packing>
-+                        <property name="expand">False</property>
-+                        <property name="fill">False</property>
-+                        <property name="position">0</property>
-+                      </packing>
-+                    </child>
-+                    <child>
-+                      <object class="GtkButton" id="remove_btn">
-+                        <property name="label">gtk-remove</property>
-+                        <property name="visible">True</property>
-+                        <property name="can_focus">True</property>
-+                        <property name="receives_default">False</property>
-+                        <property name="use_stock">True</property>
-+                      </object>
-+                      <packing>
-+                        <property name="expand">False</property>
-+                        <property name="fill">False</property>
-+                        <property name="position">1</property>
-+                      </packing>
-+                    </child>
-+                    <child>
-+                      <object class="GtkButton" id="edit_btn">
-+                        <property name="label">gtk-edit</property>
-+                        <property name="visible">True</property>
-+                        <property name="can_focus">True</property>
-+                        <property name="receives_default">False</property>
-+                        <property name="use_stock">True</property>
-+                      </object>
-+                      <packing>
-+                        <property name="expand">False</property>
-+                        <property name="fill">False</property>
-+                        <property name="position">2</property>
-+                      </packing>
-+                    </child>
-+                    <child>
-+                      <object class="GtkButton" id="moveup_btn">
-+                        <property name="label">gtk-go-up</property>
-+                        <property name="visible">True</property>
-+                        <property name="can_focus">True</property>
-+                        <property name="receives_default">False</property>
-+                        <property name="use_stock">True</property>
-+                      </object>
-+                      <packing>
-+                        <property name="expand">False</property>
-+                        <property name="fill">False</property>
-+                        <property name="position">3</property>
-+                      </packing>
-+                    </child>
-+                    <child>
-+                      <object class="GtkButton" id="movedown_btn">
-+                        <property name="label">gtk-go-down</property>
-+                        <property name="visible">True</property>
-+                        <property name="can_focus">True</property>
-+                        <property name="receives_default">False</property>
-+                        <property name="use_stock">True</property>
-+                      </object>
-+                      <packing>
-+                        <property name="expand">False</property>
-+                        <property name="fill">False</property>
-+                        <property name="position">4</property>
-+                      </packing>
-+                    </child>
-+                  </object>
-+                  <packing>
-+                    <property name="expand">False</property>
-+                    <property name="position">1</property>
-+                  </packing>
-+                </child>
-+              </object>
-+              <packing>
-+                <property name="position">2</property>
-+              </packing>
-+            </child>
-+            <child type="tab">
-+              <object class="GtkLabel" id="label3">
-+                <property name="visible">True</property>
-+                <property name="label" translatable="yes">Panel Applets</property>
-+              </object>
-+              <packing>
-+                <property name="position">2</property>
-+                <property name="tab_fill">False</property>
-+              </packing>
-+            </child>
-+            <child>
-+              <object class="GtkVBox" id="vbox3">
-+                <property name="visible">True</property>
-+                <property name="border_width">6</property>
-+                <property name="spacing">4</property>
-+                <child>
-+                  <object class="GtkFrame" id="frame6">
-+                    <property name="visible">True</property>
-+                    <property name="label_xalign">0</property>
-+                    <property name="shadow_type">none</property>
-+                    <child>
-+                      <object class="GtkAlignment" id="alignment6">
-+                        <property name="visible">True</property>
-+                        <property name="left_padding">8</property>
-+                        <child>
-+                          <object class="GtkTable" id="table3">
-+                            <property name="visible">True</property>
-+                            <property name="border_width">2</property>
-+                            <property name="n_rows">3</property>
-+                            <property name="n_columns">2</property>
-+                            <property name="row_spacing">2</property>
-+                            <child>
-+                              <object class="GtkEntry" id="logout">
-+                                <property name="visible">True</property>
-+                                <property name="can_focus">True</property>
-+                                <property name="invisible_char">&#x25CF;</property>
-+                              </object>
-+                              <packing>
-+                                <property name="left_attach">1</property>
-+                                <property name="right_attach">2</property>
-+                                <property name="top_attach">2</property>
-+                                <property name="bottom_attach">3</property>
-+                                <property name="y_options"></property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <object class="GtkEntry" id="term">
-+                                <property name="visible">True</property>
-+                                <property name="can_focus">True</property>
-+                                <property name="invisible_char">&#x25CF;</property>
-+                              </object>
-+                              <packing>
-+                                <property name="left_attach">1</property>
-+                                <property name="right_attach">2</property>
-+                                <property name="top_attach">1</property>
-+                                <property name="bottom_attach">2</property>
-+                                <property name="y_options"></property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <object class="GtkEntry" id="file_manager">
-+                                <property name="visible">True</property>
-+                                <property name="can_focus">True</property>
-+                                <property name="invisible_char">&#x25CF;</property>
-+                              </object>
-+                              <packing>
-+                                <property name="left_attach">1</property>
-+                                <property name="right_attach">2</property>
-+                                <property name="y_options"></property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <object class="GtkLabel" id="logout_label">
-+                                <property name="visible">True</property>
-+                                <property name="xalign">0</property>
-+                                <property name="label" translatable="yes">Logout Command:</property>
-+                              </object>
-+                              <packing>
-+                                <property name="top_attach">2</property>
-+                                <property name="bottom_attach">3</property>
-+                                <property name="x_options"></property>
-+                                <property name="y_options"></property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <object class="GtkLabel" id="label24">
-+                                <property name="visible">True</property>
-+                                <property name="xalign">0</property>
-+                                <property name="label" translatable="yes">Terminal Emulator:</property>
-+                              </object>
-+                              <packing>
-+                                <property name="top_attach">1</property>
-+                                <property name="bottom_attach">2</property>
-+                                <property name="x_options"></property>
-+                                <property name="y_options"></property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <object class="GtkLabel" id="label23">
-+                                <property name="visible">True</property>
-+                                <property name="xalign">0</property>
-+                                <property name="label" translatable="yes">File Manager:</property>
-+                              </object>
-+                              <packing>
-+                                <property name="x_options"></property>
-+                                <property name="y_options"></property>
-+                              </packing>
-+                            </child>
-+                          </object>
-+                        </child>
-+                      </object>
-+                    </child>
-+                    <child type="label">
-+                      <object class="GtkLabel" id="label22">
-+                        <property name="visible">True</property>
-+                        <property name="label" translatable="yes">&lt;b&gt;Set Preferred Applications&lt;/b&gt;</property>
-+                        <property name="use_markup">True</property>
-+                      </object>
-+                    </child>
-+                  </object>
-+                  <packing>
-+                    <property name="expand">False</property>
-+                    <property name="position">0</property>
-+                  </packing>
-+                </child>
-+                <child>
-+                  <object class="GtkFrame" id="frame3">
-+                    <property name="visible">True</property>
-+                    <property name="label_xalign">0</property>
-+                    <property name="shadow_type">none</property>
-+                    <child>
-+                      <object class="GtkAlignment" id="alignment3">
-+                        <property name="visible">True</property>
-+                        <property name="left_padding">8</property>
-+                        <child>
-+                          <object class="GtkVBox" id="vbox2">
-+                            <property name="visible">True</property>
-+                            <child>
-+                              <object class="GtkCheckButton" id="as_dock">
-+                                <property name="label" translatable="yes">Make window managers treat the panel as dock</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>
-+                              </object>
-+                              <packing>
-+                                <property name="expand">False</property>
-+                                <property name="fill">False</property>
-+                                <property name="position">0</property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <object class="GtkCheckButton" id="reserve_space">
-+                                <property name="label" translatable="yes">Reserve space, and not covered by maximized windows</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>
-+                              </object>
-+                              <packing>
-+                                <property name="expand">False</property>
-+                                <property name="fill">False</property>
-+                                <property name="position">1</property>
-+                              </packing>
-+                            </child>
-+                          </object>
-+                        </child>
-+                      </object>
-+                    </child>
-+                    <child type="label">
-+                      <object class="GtkLabel" id="label15">
-+                        <property name="visible">True</property>
-+                        <property name="label" translatable="yes">&lt;b&gt;Properties&lt;/b&gt;</property>
-+                        <property name="use_markup">True</property>
-+                      </object>
-+                    </child>
-+                  </object>
-+                  <packing>
-+                    <property name="expand">False</property>
-+                    <property name="position">1</property>
-+                  </packing>
-+                </child>
-+                <child>
-+                  <object class="GtkFrame" id="frame7">
-+                    <property name="visible">True</property>
-+                    <property name="label_xalign">0</property>
-+                    <property name="shadow_type">none</property>
-+                    <child>
-+                      <object class="GtkAlignment" id="alignment7">
-+                        <property name="visible">True</property>
-+                        <property name="left_padding">12</property>
-+                        <child>
-+                          <object class="GtkAlignment" id="alignment8">
-+                            <property name="visible">True</property>
-+                            <child>
-+                              <object class="GtkVBox" id="vbox8">
-+                                <property name="visible">True</property>
-+                                <property name="orientation">vertical</property>
-+                                <property name="homogeneous">True</property>
-+                                <child>
-+                                  <object class="GtkCheckButton" id="autohide">
-+                                    <property name="label" translatable="yes">Minimize panel when not in use</property>
-+                                    <property name="visible">True</property>
-+                                    <property name="can_focus">True</property>
-+                                    <property name="receives_default">False</property>
-+                                    <property name="draw_indicator">True</property>
-+                                  </object>
-+                                  <packing>
-+                                    <property name="expand">False</property>
-+                                    <property name="fill">False</property>
-+                                    <property name="position">0</property>
-+                                  </packing>
-+                                </child>
-+                                <child>
-+                                  <object class="GtkHBox" id="hbox8">
-+                                    <property name="visible">True</property>
-+                                    <child>
-+                                      <object class="GtkLabel" id="label12">
-+                                        <property name="visible">True</property>
-+                                        <property name="xalign">0</property>
-+                                        <property name="label" translatable="yes">Size when minimized</property>
-+                                      </object>
-+                                      <packing>
-+                                        <property name="position">0</property>
-+                                      </packing>
-+                                    </child>
-+                                    <child>
-+                                      <object class="GtkSpinButton" id="height_when_minimized">
-+                                        <property name="visible">True</property>
-+                                        <property name="can_focus">True</property>
-+                                        <property name="max_length">2</property>
-+                                        <property name="invisible_char">&#x2022;</property>
-+                                        <property name="adjustment">adjustment1</property>
-+                                      </object>
-+                                      <packing>
-+                                        <property name="position">1</property>
-+                                      </packing>
-+                                    </child>
-+                                    <child>
-+                                      <object class="GtkLabel" id="label2">
-+                                        <property name="visible">True</property>
-+                                        <property name="xalign">0.10000000149011612</property>
-+                                        <property name="label" translatable="yes">pixels</property>
-+                                      </object>
-+                                      <packing>
-+                                        <property name="position">2</property>
-+                                      </packing>
-+                                    </child>
-+                                  </object>
-+                                  <packing>
-+                                    <property name="expand">False</property>
-+                                    <property name="fill">False</property>
-+                                    <property name="position">1</property>
-+                                  </packing>
-+                                </child>
-+                              </object>
-+                            </child>
-+                          </object>
-+                        </child>
-+                      </object>
-+                    </child>
-+                    <child type="label">
-+                      <object class="GtkLabel" id="label13">
-+                        <property name="visible">True</property>
-+                        <property name="label" translatable="yes">&lt;b&gt;Automatic hiding&lt;/b&gt;</property>
-+                        <property name="use_markup">True</property>
-+                      </object>
-+                    </child>
-+                  </object>
-+                  <packing>
-+                    <property name="expand">False</property>
-+                    <property name="position">2</property>
-+                  </packing>
-+                </child>
-+              </object>
-+              <packing>
-+                <property name="position">3</property>
-+              </packing>
-+            </child>
-+            <child type="tab">
-+              <object class="GtkLabel" id="label4">
-+                <property name="visible">True</property>
-+                <property name="label" translatable="yes">Advanced</property>
-+              </object>
-+              <packing>
-+                <property name="position">3</property>
-+                <property name="tab_fill">False</property>
-+              </packing>
-+            </child>
-+          </object>
-+          <packing>
-+            <property name="position">2</property>
-+          </packing>
-+        </child>
-+        <child internal-child="action_area">
-+          <object class="GtkHButtonBox" id="dialog-action_area1">
-+            <property name="visible">True</property>
-+            <property name="layout_style">end</property>
-+            <child>
-+              <object class="GtkButton" id="close_btn">
-+                <property name="label">gtk-close</property>
-+                <property name="visible">True</property>
-+                <property name="can_focus">True</property>
-+                <property name="can_default">True</property>
-+                <property name="receives_default">False</property>
-+                <property name="use_stock">True</property>
-+              </object>
-+              <packing>
-+                <property name="expand">False</property>
-+                <property name="fill">False</property>
-+                <property name="position">0</property>
-+              </packing>
-+            </child>
-+          </object>
-+          <packing>
-+            <property name="expand">False</property>
-+            <property name="pack_type">end</property>
-+            <property name="position">0</property>
-+          </packing>
-+        </child>
-+      </object>
-+    </child>
-+    <action-widgets>
-+      <action-widget response="-7">close_btn</action-widget>
-+    </action-widgets>
-+  </object>
-+  <object class="GtkAdjustment" id="adjustment1">
-+    <property name="value">2</property>
-+    <property name="lower">2</property>
-+    <property name="upper">10</property>
-+    <property name="step_increment">1</property>
-+  </object>
-+  <object class="GtkAdjustment" id="adjustment2">
-+    <property name="upper">100</property>
-+    <property name="step_increment">1</property>
-+  </object>
-+  <object class="GtkAdjustment" id="adjustment3">
-+    <property name="upper">100</property>
-+    <property name="step_increment">1</property>
-+  </object>
-+  <object class="GtkAdjustment" id="adjustment4">
-+    <property name="upper">32767</property>
-+    <property name="step_increment">1</property>
-+  </object>
-+  <object class="GtkAdjustment" id="adjustment5">
-+    <property name="upper">32767</property>
-+    <property name="step_increment">1</property>
-+  </object>
-+</interface>
---- a/data/ui/panel-pref.ui
-+++ /dev/null
-@@ -1 +0,0 @@
--<?xml version="1.0"?><interface><object class="GtkListStore" id="liststore1"><columns><column type="gchararray"/></columns><data><row><col id="0" translatable="yes">Dynamic</col></row><row><col id="0" translatable="yes">Pixels</col></row><row><col id="0" translatable="yes">% Percent</col></row></data></object><object class="GtkListStore" id="liststore2"><columns><column type="gchararray"/></columns><data><row><col id="0" translatable="yes">Pixels</col></row></data></object><object class="GtkDialog" id="panel_pref"><property name="visible">True</property><property name="title" translatable="yes">Panel Preferences</property><property name="type_hint">dialog</property><child internal-child="vbox"><object class="GtkVBox" id="dialog-vbox1"><property name="visible">True</property><child><object class="GtkNotebook" id="notebook"><property name="visible">True</property><property name="can_focus">True</property><child><object class="GtkHBox" id="hbox6"><property name="visible">True</property><property name="border_width">6</property><child><object class="GtkFrame" id="frame1"><property name="visible">True</property><property name="label_xalign">0</property><property name="shadow_type">none</property><child><object class="GtkAlignment" id="alignment1"><property name="visible">True</property><property name="left_padding">8</property><child><object class="GtkTable" id="table1"><property name="visible">True</property><property name="n_rows">3</property><property name="n_columns">2</property><property name="row_spacing">2</property><child><object class="GtkLabel" id="label7"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Edge:</property></object><packing><property name="x_options"></property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="label8"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Alignment:</property></object><packing><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options"></property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="label9"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Margin:</property></object><packing><property name="top_attach">2</property><property name="bottom_attach">3</property><property name="x_options"></property><property name="y_options"></property></packing></child><child><object class="GtkSpinButton" id="margin"><property name="visible">True</property><property name="can_focus">True</property><property name="invisible_char">&#x2022;</property><property name="adjustment">adjustment4</property><property name="climb_rate">1</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">2</property><property name="bottom_attach">3</property><property name="x_options"></property><property name="y_options"></property></packing></child><child><object class="GtkVBox" id="vbox7"><property name="visible">True</property><property name="orientation">vertical</property><child><object class="GtkRadioButton" id="edge_bottom"><property name="label" translatable="yes">Bottom</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">False</property><property name="active">True</property><property name="draw_indicator">True</property></object><packing><property name="position">0</property></packing></child><child><object class="GtkRadioButton" id="edge_top"><property name="label" translatable="yes">Top</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">False</property><property name="draw_indicator">True</property><property name="group">edge_bottom</property></object><packing><property name="position">1</property></packing></child><child><object class="GtkRadioButton" id="edge_left"><property name="label" translatable="yes">Left</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">False</property><property name="draw_indicator">True</property><property name="group">edge_bottom</property></object><packing><property name="position">2</property></packing></child><child><object class="GtkRadioButton" id="edge_right"><property name="label" translatable="yes">Right</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">False</property><property name="draw_indicator">True</property><property name="group">edge_bottom</property></object><packing><property name="position">3</property></packing></child></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="y_options">GTK_FILL</property></packing></child><child><object class="GtkVBox" id="vbox9"><property name="visible">True</property><property name="orientation">vertical</property><child><object class="GtkRadioButton" id="alignment_left"><property name="label" translatable="yes">Left</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">False</property><property name="active">True</property><property name="draw_indicator">True</property></object><packing><property name="position">0</property></packing></child><child><object class="GtkRadioButton" id="alignment_center"><property name="label" translatable="yes">Center</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">False</property><property name="draw_indicator">True</property><property name="group">alignment_left</property></object><packing><property name="position">1</property></packing></child><child><object class="GtkRadioButton" id="alignment_right"><property name="label" translatable="yes">Right</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">False</property><property name="draw_indicator">True</property><property name="group">alignment_left</property></object><packing><property name="position">2</property></packing></child></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="y_options">GTK_FILL</property></packing></child></object></child></object></child><child type="label"><object class="GtkLabel" id="label5"><property name="visible">True</property><property name="label" translatable="yes">&lt;b&gt;Position&lt;/b&gt;</property><property name="use_markup">True</property></object></child></object><packing><property name="position">0</property></packing></child><child><object class="GtkFrame" id="frame2"><property name="visible">True</property><property name="label_xalign">0</property><property name="shadow_type">none</property><child><object class="GtkAlignment" id="alignment2"><property name="visible">True</property><property name="left_padding">8</property><child><object class="GtkTable" id="table2"><property name="visible">True</property><property name="n_rows">3</property><property name="n_columns">3</property><property name="row_spacing">2</property><child><object class="GtkLabel" id="width_label"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Width:</property></object><packing><property name="x_options"></property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="height_label"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Height:</property></object><packing><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options"></property><property name="y_options"></property></packing></child><child><object class="GtkComboBox" id="height_unit"><property name="visible">True</property><property name="model">liststore2</property><child><object class="GtkCellRendererText" id="cellrenderertext2"/><attributes><attribute name="text">0</attribute></attributes></child></object><packing><property name="left_attach">2</property><property name="right_attach">3</property><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options"></property><property name="y_options"></property></packing></child><child><object class="GtkSpinButton" id="width"><property name="visible">True</property><property name="can_focus">True</property><property name="invisible_char">&#x2022;</property><property name="adjustment">adjustment3</property><property name="climb_rate">1</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="x_options"></property><property name="y_options"></property></packing></child><child><object class="GtkSpinButton" id="height"><property name="visible">True</property><property name="can_focus">True</property><property name="invisible_char">&#x2022;</property><property name="adjustment">adjustment2</property><property name="climb_rate">1</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options"></property><property name="y_options"></property></packing></child><child><object class="GtkComboBox" id="width_unit"><property name="visible">True</property><property name="model">liststore1</property><child><object class="GtkCellRendererText" id="cellrenderertext1"/><attributes><attribute name="text">0</attribute></attributes></child></object><packing><property name="left_attach">2</property><property name="right_attach">3</property><property name="x_options"></property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="label11"><property name="visible">True</property><property name="label" translatable="yes">&lt;b&gt;Icon&lt;/b&gt;</property><property name="use_markup">True</property></object><packing><property name="top_attach">2</property><property name="bottom_attach">3</property><property name="y_options"></property></packing></child><child><object class="GtkSpinButton" id="icon_size"><property name="visible">True</property><property name="can_focus">True</property><property name="invisible_char">&#x2022;</property><property name="adjustment">adjustment5</property><property name="climb_rate">1</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">2</property><property name="bottom_attach">3</property><property name="x_options"></property><property name="y_options">GTK_SHRINK</property></packing></child><child><object class="GtkLabel" id="label14"><property name="visible">True</property><property name="label" translatable="yes">pixels</property></object><packing><property name="left_attach">2</property><property name="right_attach">3</property><property name="top_attach">2</property><property name="bottom_attach">3</property></packing></child></object></child></object></child><child type="label"><object class="GtkLabel" id="label6"><property name="visible">True</property><property name="label" translatable="yes">&lt;b&gt;Size&lt;/b&gt;</property><property name="use_markup">True</property></object></child></object><packing><property name="position">1</property></packing></child></object></child><child type="tab"><object class="GtkLabel" id="label1"><property name="visible">True</property><property name="label" translatable="yes">Geometry</property></object><packing><property name="tab_fill">False</property></packing></child><child><object class="GtkVBox" id="vbox1"><property name="visible">True</property><property name="border_width">6</property><property name="spacing">4</property><child><object class="GtkFrame" id="frame4"><property name="visible">True</property><property name="label_xalign">0</property><property name="shadow_type">none</property><child><object class="GtkAlignment" id="alignment4"><property name="visible">True</property><property name="left_padding">8</property><child><object class="GtkVBox" id="vbox4"><property name="visible">True</property><property name="orientation">vertical</property><property name="spacing">2</property><child><object class="GtkRadioButton" id="bg_none"><property name="label" translatable="yes">System theme</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="active">True</property><property name="draw_indicator">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkHBox" id="hbox2"><property name="visible">True</property><property name="spacing">10</property><child><object class="GtkRadioButton" id="bg_transparency"><property name="label" translatable="yes">Solid color (with opacity)</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><property name="group">bg_none</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkColorButton" id="tint_clr"><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">True</property><property name="use_alpha">True</property><property name="color">#000000000000</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">1</property></packing></child><child><object class="GtkHBox" id="hbox4"><property name="visible">True</property><property name="spacing">40</property><child><object class="GtkRadioButton" id="bg_image"><property name="label" translatable="yes">Image</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><property name="group">bg_none</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkFileChooserButton" id="img_file"><property name="visible">True</property><property name="title" translatable="yes">Select an image file</property></object><packing><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">2</property></packing></child></object></child></object></child><child type="label"><object class="GtkLabel" id="label18"><property name="visible">True</property><property name="label" translatable="yes">&lt;b&gt;Background&lt;/b&gt;</property><property name="use_markup">True</property></object></child></object><packing><property name="expand">False</property><property name="position">0</property></packing></child><child><object class="GtkFrame" id="frame5"><property name="visible">True</property><property name="label_xalign">0</property><property name="shadow_type">none</property><child><object class="GtkAlignment" id="alignment5"><property name="visible">True</property><property name="left_padding">8</property><child><object class="GtkHBox" id="hbox1"><property name="visible">True</property><property name="spacing">10</property><child><object class="GtkCheckButton" id="use_font_clr"><property name="label" translatable="yes">Custom color</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></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkColorButton" id="font_clr"><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">True</property><property name="color">#000000000000</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">1</property></packing></child></object></child></object></child><child type="label"><object class="GtkLabel" id="label19"><property name="visible">True</property><property name="label" translatable="yes">&lt;b&gt;Font&lt;/b&gt;</property><property name="use_markup">True</property></object></child></object><packing><property name="expand">False</property><property name="position">1</property></packing></child></object><packing><property name="position">1</property></packing></child><child type="tab"><object class="GtkLabel" id="label10"><property name="visible">True</property><property name="label" translatable="yes">Appearance</property></object><packing><property name="position">1</property><property name="tab_fill">False</property></packing></child><child><object class="GtkHBox" id="hbox5"><property name="visible">True</property><property name="spacing">2</property><child><object class="GtkVBox" id="vbox5"><property name="visible">True</property><child><object class="GtkScrolledWindow" id="scrolledwindow1"><property name="visible">True</property><property name="can_focus">True</property><property name="hscrollbar_policy">automatic</property><property name="vscrollbar_policy">automatic</property><property name="shadow_type">in</property><child><object class="GtkTreeView" id="plugin_list"><property name="visible">True</property><property name="can_focus">True</property><property name="rules_hint">True</property></object></child></object><packing><property name="position">0</property></packing></child><child><object class="GtkLabel" id="plugin_desc"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="wrap">True</property><property name="selectable">True</property><property name="ellipsize">end</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">1</property></packing></child></object><packing><property name="position">0</property></packing></child><child><object class="GtkVBox" id="vbox6"><property name="visible">True</property><property name="border_width">2</property><property name="spacing">2</property><child><object class="GtkButton" id="add_btn"><property name="label">gtk-add</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">False</property><property name="use_stock">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkButton" id="remove_btn"><property name="label">gtk-remove</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">False</property><property name="use_stock">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">1</property></packing></child><child><object class="GtkButton" id="edit_btn"><property name="label">gtk-edit</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">False</property><property name="use_stock">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">2</property></packing></child><child><object class="GtkButton" id="moveup_btn"><property name="label">gtk-go-up</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">False</property><property name="use_stock">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">3</property></packing></child><child><object class="GtkButton" id="movedown_btn"><property name="label">gtk-go-down</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">False</property><property name="use_stock">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">4</property></packing></child></object><packing><property name="expand">False</property><property name="position">1</property></packing></child></object><packing><property name="position">2</property></packing></child><child type="tab"><object class="GtkLabel" id="label3"><property name="visible">True</property><property name="label" translatable="yes">Panel Applets</property></object><packing><property name="position">2</property><property name="tab_fill">False</property></packing></child><child><object class="GtkVBox" id="vbox3"><property name="visible">True</property><property name="border_width">6</property><property name="spacing">4</property><child><object class="GtkFrame" id="frame6"><property name="visible">True</property><property name="label_xalign">0</property><property name="shadow_type">none</property><child><object class="GtkAlignment" id="alignment6"><property name="visible">True</property><property name="left_padding">8</property><child><object class="GtkTable" id="table3"><property name="visible">True</property><property name="border_width">2</property><property name="n_rows">3</property><property name="n_columns">2</property><property name="row_spacing">2</property><child><object class="GtkEntry" id="logout"><property name="visible">True</property><property name="can_focus">True</property><property name="invisible_char">&#x25CF;</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">2</property><property name="bottom_attach">3</property><property name="y_options"></property></packing></child><child><object class="GtkEntry" id="term"><property name="visible">True</property><property name="can_focus">True</property><property name="invisible_char">&#x25CF;</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="y_options"></property></packing></child><child><object class="GtkEntry" id="file_manager"><property name="visible">True</property><property name="can_focus">True</property><property name="invisible_char">&#x25CF;</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="logout_label"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Logout Command:</property></object><packing><property name="top_attach">2</property><property name="bottom_attach">3</property><property name="x_options"></property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="label24"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Terminal Emulator:</property></object><packing><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options"></property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="label23"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">File Manager:</property></object><packing><property name="x_options"></property><property name="y_options"></property></packing></child></object></child></object></child><child type="label"><object class="GtkLabel" id="label22"><property name="visible">True</property><property name="label" translatable="yes">&lt;b&gt;Set Preferred Applications&lt;/b&gt;</property><property name="use_markup">True</property></object></child></object><packing><property name="expand">False</property><property name="position">0</property></packing></child><child><object class="GtkFrame" id="frame3"><property name="visible">True</property><property name="label_xalign">0</property><property name="shadow_type">none</property><child><object class="GtkAlignment" id="alignment3"><property name="visible">True</property><property name="left_padding">8</property><child><object class="GtkVBox" id="vbox2"><property name="visible">True</property><child><object class="GtkCheckButton" id="as_dock"><property name="label" translatable="yes">Make window managers treat the panel as dock</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></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkCheckButton" id="reserve_space"><property name="label" translatable="yes">Reserve space, and not covered by maximized windows</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></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">1</property></packing></child></object></child></object></child><child type="label"><object class="GtkLabel" id="label15"><property name="visible">True</property><property name="label" translatable="yes">&lt;b&gt;Properties&lt;/b&gt;</property><property name="use_markup">True</property></object></child></object><packing><property name="expand">False</property><property name="position">1</property></packing></child><child><object class="GtkFrame" id="frame7"><property name="visible">True</property><property name="label_xalign">0</property><property name="shadow_type">none</property><child><object class="GtkAlignment" id="alignment7"><property name="visible">True</property><property name="left_padding">12</property><child><object class="GtkAlignment" id="alignment8"><property name="visible">True</property><child><object class="GtkVBox" id="vbox8"><property name="visible">True</property><property name="orientation">vertical</property><property name="homogeneous">True</property><child><object class="GtkCheckButton" id="autohide"><property name="label" translatable="yes">Minimize panel when not in use</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">False</property><property name="draw_indicator">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkHBox" id="hbox8"><property name="visible">True</property><child><object class="GtkLabel" id="label12"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Size when minimized</property></object><packing><property name="position">0</property></packing></child><child><object class="GtkSpinButton" id="height_when_minimized"><property name="visible">True</property><property name="can_focus">True</property><property name="max_length">2</property><property name="invisible_char">&#x2022;</property><property name="adjustment">adjustment1</property></object><packing><property name="position">1</property></packing></child><child><object class="GtkLabel" id="label2"><property name="visible">True</property><property name="xalign">0.10000000149011612</property><property name="label" translatable="yes">pixels</property></object><packing><property name="position">2</property></packing></child></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">1</property></packing></child></object></child></object></child></object></child><child type="label"><object class="GtkLabel" id="label13"><property name="visible">True</property><property name="label" translatable="yes">&lt;b&gt;Automatic hiding&lt;/b&gt;</property><property name="use_markup">True</property></object></child></object><packing><property name="expand">False</property><property name="position">2</property></packing></child></object><packing><property name="position">3</property></packing></child><child type="tab"><object class="GtkLabel" id="label4"><property name="visible">True</property><property name="label" translatable="yes">Advanced</property></object><packing><property name="position">3</property><property name="tab_fill">False</property></packing></child></object><packing><property name="position">2</property></packing></child><child internal-child="action_area"><object class="GtkHButtonBox" id="dialog-action_area1"><property name="visible">True</property><property name="layout_style">end</property><child><object class="GtkButton" id="close_btn"><property name="label">gtk-close</property><property name="visible">True</property><property name="can_focus">True</property><property name="can_default">True</property><property name="receives_default">False</property><property name="use_stock">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child></object><packing><property name="expand">False</property><property name="pack_type">end</property><property name="position">0</property></packing></child></object></child><action-widgets><action-widget response="-7">close_btn</action-widget></action-widgets></object><object class="GtkAdjustment" id="adjustment1"><property name="value">2</property><property name="lower">2</property><property name="upper">10</property><property name="step_increment">1</property></object><object class="GtkAdjustment" id="adjustment2"><property name="upper">100</property><property name="step_increment">1</property></object><object class="GtkAdjustment" id="adjustment3"><property name="upper">100</property><property name="step_increment">1</property></object><object class="GtkAdjustment" id="adjustment4"><property name="upper">32767</property><property name="step_increment">1</property></object><object class="GtkAdjustment" id="adjustment5"><property name="upper">32767</property><property name="step_increment">1</property></object></interface>
---- a/data/Makefile.am
-+++ b/data/Makefile.am
-@@ -8,11 +8,19 @@
- uidir=$(datadir)/lxpanel/ui
- ui_in_files= \
--      ui/panel-pref.ui \
--      ui/launchbar.ui \
--      ui/netstatus.ui
-+      ui/panel-pref.glade \
-+      ui/launchbar.glade \
-+      ui/netstatus.glade
--ui_DATA = $(ui_in_files)
-+ui_DATA = $(ui_in_files:.glade=.ui)
-+
-+# Generate GtkBuilder UI files from Glade files
-+%.ui: %.glade
-+      cp $< $@
-+      $(top_builddir)/src/xml-purge $@
-+
-+CLEANFILES = \
-+      $(ui_DATA)
- lxpanel_images_DATA = \
-       images/my-computer.png \
diff --git a/debian/patches/potfiles-in.patch b/debian/patches/potfiles-in.patch
new file mode 100644 (file)
index 0000000..a683a18
--- /dev/null
@@ -0,0 +1,30 @@
+Author: Sergey Slipchenko <faergeek@gmail.com>
+Description: Remove missing files to pass check target
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -14,7 +14,6 @@ data/ui/panel-pref.ui
+ # Putting translation of plugins in main catalog is not a good idea...
+ src/plugins/cpu/cpu.c
+ src/plugins/deskno/deskno.c
+-src/plugins/image.c
+ src/plugins/launchbar.c
+ src/plugins/taskbar.c
+ src/plugins/dclock.c
+@@ -32,17 +31,12 @@ src/plugins/volume/volume.c
+ src/plugins/volume/volume-impl.c
+ src/plugins/volumealsa/volumealsa.c
+-src/plugins/netstat/netstat.c
+-src/plugins/netstat/passwd_gui.c
+-src/plugins/netstat/lxnm_client.c
+-
+ src/plugins/netstatus/netstatus.c
+ src/plugins/netstatus/netstatus-dialog.c
+ src/plugins/netstatus/netstatus-icon.c
+ src/plugins/netstatus/netstatus-iface.c
+ src/plugins/netstatus/netstatus-sysdeps.c
+ src/plugins/netstatus/netstatus-util.c
+-src/plugins/netstatus/gnome-netstatus.glade
+ src/plugins/batt/batt.c
diff --git a/debian/patches/redefine-alarm-variable.patch b/debian/patches/redefine-alarm-variable.patch
deleted file mode 100644 (file)
index 5742afa..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-#http://dep.debian.net/deps/dep3/
-Description: A patch to rename alarm variable already defined in include header.
-
-Origin: Ubuntu
-Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3007605&group_id=180858&atid=894871
-Author: Julien Lavergne <gilir@ubuntu.com>
-Last-Update: 2010-05-26
-
---- lxpanel-0.5.5.orig/src/plugins/batt/batt.c
-+++ lxpanel-0.5.5/src/plugins/batt/batt.c
-@@ -95,15 +95,15 @@ typedef struct {
- typedef struct {
-     char *command;
-     sem_t *lock;
--} alarm;
-+} alarmStruct;
- static void destructor(Plugin *p);
- static void update_display(lx_battery *lx_b, gboolean repaint);
--/* alarmProcess takes the address of a dynamically allocated alarm struct (which
-+/* alarmProcess takes the address of a dynamically allocated alarmStruct struct (which
-    it must free). It ensures that alarm commands do not run concurrently. */
- static void * alarmProcess(void *arg) {
--    alarm *a = (alarm *) arg;
-+    alarmStruct *a = (alarmStruct *) arg;
-     sem_wait(a->lock);
-     system(a->command);
-@@ -157,7 +157,7 @@ void update_display(lx_battery *lx_b, gb
-       /* Run the alarm command if it isn't already running */
-       if (alarmCanRun) {
-           
--          alarm *a = (alarm *) malloc(sizeof(alarm));
-+          alarmStruct *a = (alarmStruct *) malloc(sizeof(alarmStruct));
-           a->command = lx_b->alarmCommand;
-           a->lock = &(lx_b->alarmProcessLock);
-           
diff --git a/debian/patches/run-in-background.patch b/debian/patches/run-in-background.patch
new file mode 100644 (file)
index 0000000..d7a8e0c
--- /dev/null
@@ -0,0 +1,13 @@
+Author: Sergey Slipchenko <faergeek@gmail.com>
+Description: Closes: #656672
+--- a/src/gtk-run.c
++++ b/src/gtk-run.c
+@@ -344,7 +344,7 @@ void gtk_run()
+     gtk_widget_show_all( win );
+     setup_auto_complete( (GtkEntry*)entry );
+-    gtk_widget_show( win );
++    gtk_window_present(GTK_WINDOW(win));
+     g_signal_connect(entry ,"changed", G_CALLBACK(on_entry_changed), img);
index 6617396..4f31800 100644 (file)
@@ -1,3 +1,4 @@
-missing_glades.patch
 default-config.patch
 configure_desktop_number.patch
+potfiles-in.patch
+run-in-background.patch
index 26c136f..6661843 100755 (executable)
@@ -5,17 +5,10 @@
 #export DH_VERBOSE=1
 
 %:
-       dh $@ --with autoreconf
-
-autoreconf:
-       autoreconf --install --force
-       intltoolize --copy --force --automake
-
-override_dh_autoreconf:
-       dh_autoreconf debian/rules -- autoreconf
+       dh $@
 
 override_dh_auto_configure:
        dh_auto_configure -- --enable-man
 
-override_dh_auto_test:
-       # Disable: check failed in po/.
+override_dh_install:
+       dh_install --fail-missing
diff --git a/debian/source/options b/debian/source/options
deleted file mode 100644 (file)
index 779dbfd..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-compression = "bzip2"
-compression-level = 9