Merge lp:~awn-testing/awn/awn-rewrite-ua-support into lp:~awn-core/awn/trunk-rewrite

[moonbeam]

[moonbeam (rcryderman)]

It may not perfect, but I think it's good enough for a merge at this point. There's some design ugliness due to the alignment being outside of the socket. But most of the ua specific code is in its own object. And if UA/screenlets are not being used then there is close to zero impact on the code paths used by awn.

[lp:~awn-testing/awn/awn-rewrite-ua-support]

838. By moonbeam on 2009-07-15

* .bzrignore:
* INSTALL:
 Sync with files in Rewrite.
* src/awn-applet-manager.c:
 Removed some debugs.

839. By moonbeam on 2009-07-15

* src/awn-ua-alignment.c:
 Destroy the socket when ua/screenlet removed from the ua_acitive_list.

840. By Julien Lavergne on 2009-07-15

Fix tabs in awnClass.py (require by PEP8)

841. By Julien Lavergne on 2009-07-15

Fix also tabs in AwnDefs.py.in

842. By moonbeam on 2009-07-16

* applets/uawrapper/awn-ua-wrapper.h:
       Removed leftover file

843. By moonbeam on 2009-07-16

* libawn/awn-alignment.c:
       Sync file with rewrite.

844. By moonbeam on 2009-07-16

* src/awn-applet-manager.c:
* src/awn-applet-manager.h:
* src/awn-ua-alignment.c:
       Various whitespace fixes.
       Modified awn_ua_get_all_server_flags().
       Removed touch_quark set on UaAlignment() for UAAlignment.

845. By moonbeam on 2009-07-16

Merge rewrite.

846. By moonbeam on 2009-07-16

* applets/uawrapper/:
 Removed empty dir.

847. By moonbeam on 2009-07-17

Merged rewrite

848. By Michal Hruby on 2009-07-17

Changes to the DBus interface

Unmerged revisions

=== modified file '.bzrignore'
--- .bzrignore	2009-07-09 07:12:27 +0000
+++ .bzrignore	2009-07-13 18:05:02 +0000
@@ -107,6 +107,12 @@
 src/stamp-awnmarshal.h
 applets/taskmanager/taskmanager-marshal.c
 applets/taskmanager/taskmanager-marshal.h
+debian/patches/*.log
+debian/stamp*
+debian/libawn*/*
+debian/avant-*/*
+debian/python*/*
+debian/awn*/*
 doltcompile
 doltlibtool
 m4/lt*.m4
 
=== modified file 'INSTALL'
--- INSTALL	2009-05-22 09:16:20 +0000
+++ INSTALL	2009-06-25 04:55:53 +0000
@@ -2,15 +2,15 @@
 *************************
 
 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008 Free Software Foundation, Inc.
+2006, 2007 Free Software Foundation, Inc.
 
-   This file is free documentation; the Free Software Foundation gives
+This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
 
 Basic Installation
 ==================
 
-   Briefly, the shell commands `./configure; make; make install' should
+Briefly, the shell commands `./configure; make; make install' should
 configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
 instructions specific to this package.
@@ -73,9 +73,9 @@
 Compilers and Options
 =====================
 
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  Run `./configure --help'
-for details on some of the pertinent environment variables.
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about.  Run `./configure --help' for
+details on some of the pertinent environment variables.
 
    You can give `configure' initial values for configuration parameters
 by setting variables in the command line or in the environment.  Here
@@ -88,7 +88,7 @@
 Compiling For Multiple Architectures
 ====================================
 
-   You can compile the package for more than one kind of computer at the
+You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
 own directory.  To do this, you can use GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
@@ -100,24 +100,10 @@
 installed the package for one architecture, use `make distclean' before
 reconfiguring for another architecture.
 
-   On MacOS X 10.5 and later systems, you can create libraries and
-executables that work on multiple system types--known as "fat" or
-"universal" binaries--by specifying multiple `-arch' options to the
-compiler but only a single `-arch' option to the preprocessor.  Like
-this:
-
-     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-                 CPP="gcc -E" CXXCPP="g++ -E"
-
-   This is not guaranteed to produce working output in all cases, you
-may have to build one architecture at a time and combine the results
-using the `lipo' tool if you have problems.
-
 Installation Names
 ==================
 
-   By default, `make install' installs the package's commands under
+By default, `make install' installs the package's commands under
 `/usr/local/bin', include files under `/usr/local/include', etc.  You
 can specify an installation prefix other than `/usr/local' by giving
 `configure' the option `--prefix=PREFIX'.
@@ -140,7 +126,7 @@
 Optional Features
 =================
 
-   Some packages pay attention to `--enable-FEATURE' options to
+Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
 is something like `gnu-as' or `x' (for the X Window System).  The
@@ -152,36 +138,14 @@
 you can use the `configure' options `--x-includes=DIR' and
 `--x-libraries=DIR' to specify their locations.
 
-Particular systems
-==================
-
-   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
-CC is not installed, it is recommended to use the following options in
-order to use an ANSI C compiler:
-
-     ./configure CC="cc -Ae"
-
-and if that doesn't work, install pre-built binaries of GCC for HP-UX.
-
-   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
-a workaround.  If GNU CC is not installed, it is therefore recommended
-to try
-
-     ./configure CC="cc"
-
-and if that doesn't work, try
-
-     ./configure CC="cc -nodtk"
-
 Specifying the System Type
 ==========================
 
-   There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on.  Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
 `--build=TYPE' option.  TYPE can either be a short name for the system
 type, such as `sun4', or a canonical name which has the form:
 
@@ -207,9 +171,9 @@
 Sharing Defaults
 ================
 
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
 `configure' looks for `PREFIX/share/config.site' if it exists, then
 `PREFIX/etc/config.site' if it exists.  Or, you can set the
 `CONFIG_SITE' environment variable to the location of the site script.
@@ -218,7 +182,7 @@
 Defining Variables
 ==================
 
-   Variables not defined in a site shell script can be set in the
+Variables not defined in a site shell script can be set in the
 environment passed to `configure'.  However, some packages may run
 configure again during the build, and the customized values of these
 variables may be lost.  In order to avoid this problem, you should set
@@ -237,19 +201,11 @@
 `configure' Invocation
 ======================
 
-   `configure' recognizes the following options to control how it
-operates.
+`configure' recognizes the following options to control how it operates.
 
 `--help'
 `-h'
-     Print a summary of all of the options to `configure', and exit.
-
-`--help=short'
-`--help=recursive'
-     Print a summary of the options unique to this package's
-     `configure', and exit.  The `short' variant lists options used
-     only in the top level, while the `recursive' variant lists options
-     also present in any nested packages.
+     Print a summary of the options to `configure', and exit.
 
 `--version'
 `-V'
@@ -276,16 +232,6 @@
      Look for the package's source code in directory DIR.  Usually
      `configure' can determine that directory automatically.
 
-`--prefix=DIR'
-     Use DIR as the installation prefix.  *Note Installation Names::
-     for more details, including other options available for fine-tuning
-     the installation locations.
-
-`--no-create'
-`-n'
-     Run the configure checks, but stop before creating any output
-     files.
-
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.
 
 
=== added directory 'applets/uawrapper'
=== added file 'applets/uawrapper/awn-ua-wrapper.h'
--- applets/uawrapper/awn-ua-wrapper.h	1970-01-01 00:00:00 +0000
+++ applets/uawrapper/awn-ua-wrapper.h	2009-06-25 04:55:53 +0000
@@ -0,0 +1,42 @@
+/* awn-ua-wrapper.h */
+
+#ifndef _AWN_UA_WRAPPER
+#define _AWN_UA_WRAPPER
+
+#include <glib-object.h>
+#include <libawn/libawn.h>
+
+G_BEGIN_DECLS
+
+#define AWN_TYPE_UA_WRAPPER awn_ua_wrapper_get_type()
+
+#define AWN_UA_WRAPPER(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), AWN_TYPE_UA_WRAPPER, AwnUAWrapper))
+
+#define AWN_UA_WRAPPER_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), AWN_TYPE_UA_WRAPPER, AwnUAWrapperClass))
+
+#define AWN_IS_UA_WRAPPER(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), AWN_TYPE_UA_WRAPPER))
+
+#define AWN_IS_UA_WRAPPER_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), AWN_TYPE_UA_WRAPPER))
+
+#define AWN_UA_WRAPPER_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), AWN_TYPE_UA_WRAPPER, AwnUAWrapperClass))
+
+typedef struct {
+  AwnApplet parent;
+} AwnUAWrapper;
+
+typedef struct {
+  AwnAppletClass parent_class;
+} AwnUAWrapperClass;
+
+GType awn_ua_wrapper_get_type (void);
+
+AwnUAWrapper* awn_ua_wrapper_new (gchar* uid, gint panel_id);
+
+G_END_DECLS
+
+#endif /* _AWN_UA_WRAPPER */
 
=== modified file 'awn-settings/awnClass.py'
--- awn-settings/awnClass.py	2009-07-10 00:56:51 +0000
+++ awn-settings/awnClass.py	2009-07-14 17:57:18 +0000
@@ -1537,16 +1537,22 @@
             os.unlink(filename)
 
     def _apply (self):
-        l = []
+        applets_list = []
+	ua_list = []
+
         it = self.active_model.get_iter_first ()
         while (it):
             path = self.active_model.get_value (it, 1)
             uid = self.active_model.get_value (it, 2)
             s = "%s::%s" % (path, uid)
-            l.append (s)
+            if path.endswith(".desktop"):
+            	applets_list.append(s)
+            else:
+            	ua_list.append(s)
+
             it= self.active_model.iter_next (it)
 
-        self.client.set_list(defs.PANEL, defs.APPLET_LIST, awn.CONFIG_LIST_STRING, l)
+        self.client.set_list(defs.PANEL, defs.APPLET_LIST, awn.CONFIG_LIST_STRING, applets_list)
 
     def up_clicked (self, button):
         select = self.treeview.get_selection()
@@ -1592,18 +1598,32 @@
 
         applets = self.client.get_list(defs.PANEL, defs.APPLET_LIST, awn.CONFIG_LIST_STRING)
 
+	ua_applets = self.client.get_list(defs.PANEL, defs.UA_LIST, awn.CONFIG_LIST_STRING)
+	
+	for ua in ua_applets:
+		tokens = ua.split("::")
+		applets.insert(int(tokens[1]), ua)
+
         self.refresh_icon_list (applets, self.active_model)
 
     def refresh_icon_list (self, applets, model):
-        for a in applets:
-            tokens = a.split("::")
-            path = tokens[0]
-            uid = tokens[1]
-            icon, text, name = self.make_row(path)
-            if len (text) < 2:
-                continue;
+	for a in applets:
+		tokens = a.split("::")
+		if tokens[0].endswith(".desktop"):
+			path = tokens[0]
+			uid = tokens[1]
+			icon, text, name = self.make_row(path)
+			if len (text) < 2:
+				continue;
 
-            model.append([icon, path, uid, text])
+			model.append([icon, path, uid, text])
+		else:
+			path = tokens[0]
+			uid = tokens[1]
+			theme = gtk.icon_theme_get_default ()
+			icon = theme.load_icon ("screenlets", 32, 0)
+			text = tokens[0]
+			model.append([icon, path, uid, text])
 
     def load_applets (self):
         applets = self.applets_by_categories()
@@ -1645,7 +1665,21 @@
         applets = l.values()
 
         if not None in applets and self.load_finished:
-            self.client.set_list(defs.PANEL, defs.APPLET_LIST, awn.CONFIG_LIST_STRING, applets)
+		applets_list = []
+		ua_list = []
+		for a in applets:
+			tokens = a.split("::")
+			path = tokens[0]
+			if path.endswith(".desktop"):
+				applets_list.append(a)
+			else:
+				position = applets.index(a)
+				ua = tokens[0] + "::" + str(position)
+				ua_list.append(ua)
+
+            	self.client.set_list(defs.PANEL, defs.APPLET_LIST, awn.CONFIG_LIST_STRING, applets_list)
+		self.client.set_list(defs.PANEL, defs.UA_LIST, awn.CONFIG_LIST_STRING, ua_list)
+
 
     def callback_widget_filter_applets(self, data=None):
         model = self.choose_categorie.get_model()
 
=== modified file 'awn-settings/awnDefs.py.in'
--- awn-settings/awnDefs.py.in	2009-07-10 00:56:51 +0000
+++ awn-settings/awnDefs.py.in	2009-07-14 19:09:25 +0000
@@ -59,6 +59,7 @@
 EXPAND                  = "expand"              #bool
 CLICKTHROUGH            = "clickthrough"        #int
 BEHAVIOR                = "behavior"            #int
+UA_LIST			= "ua_active_list"	#list-string
 
 PANELS                  = "panels"              #group
 PANEL_LIST              = "panel_list"          #int
 
=== modified file 'data/awn.schema-ini.in'
--- data/awn.schema-ini.in	2009-07-06 22:12:25 +0000
+++ data/awn.schema-ini.in	2009-07-14 18:01:40 +0000
@@ -28,6 +28,16 @@
 default = @APPLETDATADIR@/taskmanager.desktop::1
 description = The list of applets for this panel ordered from ltr or ttb.
 
+[panel/ua_list]
+type = list-string
+default = 
+description = The list of UA Screenlets that have been previous added in the form ScreeneletInstance::Position.
+
+[panel/ua_active_list]
+type = list-string
+default = 
+description = The active list UA Screenlets for this panel.
+
 [panel/monitor_force]
 type = bool
 default = False
 
=== modified file 'libawn/awn-alignment.c'
--- libawn/awn-alignment.c	2009-03-26 23:47:26 +0000
+++ libawn/awn-alignment.c	2009-06-25 18:26:59 +0000
@@ -192,6 +192,18 @@
   return alignment;
 }
 
+GtkWidget*
+awn_alignment_new (void)
+{
+  GtkWidget *alignment;
+
+  alignment = g_object_new(AWN_TYPE_ALIGNMENT,
+                           NULL);
+
+  return alignment;
+}
+
+
 static void
 on_orient_changed (AwnAlignment *alignment, AwnOrientation orient)
 {
 
=== modified file 'libawn/awn-alignment.h'
--- libawn/awn-alignment.h	2009-03-22 23:12:16 +0000
+++ libawn/awn-alignment.h	2009-06-25 18:26:59 +0000
@@ -80,6 +80,8 @@
 void          awn_alignment_set_offset_modifier  (AwnAlignment *alignment, 
                                                   gint modifier);
 
+GtkWidget*    awn_alignment_new (void);
+
 G_END_DECLS
 
 #endif
 
=== modified file 'src/Makefile.am'
--- src/Makefile.am	2009-06-21 13:23:05 +0000
+++ src/Makefile.am	2009-07-13 18:20:16 +0000
@@ -27,6 +27,7 @@
 	awn-app-glue.h \
 	awn-applet-manager.c \
 	awn-applet-manager.h \
+	awn-applet-manager-glue.h \
 	awn-applet-proxy.c \
 	awn-applet-proxy.h \
 	awn-background.c \
@@ -51,6 +52,8 @@
 	awn-panel-glue.h \
 	awn-throbber.c \
 	awn-throbber.h \
+	awn-ua-alignment.c \
+	awn-ua-alignment.h \
 	awn-x.h \
 	awn-x.c \
 	inlinepixbufs.h \
@@ -65,9 +68,13 @@
 awn-panel-glue.h: awn-panel-dbus.xml Makefile
 	$(LIBTOOL) --mode=execute $(DBUS_GLIB_BIN)/dbus-binding-tool --prefix=awn_panel --mode=glib-server --output=$@ $<
 
+awn-applet-manager-glue.h: awn-applet-manager-dbus.xml Makefile
+	$(LIBTOOL) --mode=execute $(DBUS_GLIB_BIN)/dbus-binding-tool --prefix=awn_ua --mode=glib-server --output=$@ $<
+
 BUILT_SOURCES = \
 	awn-app-glue.h \
 	awn-panel-glue.h \
+	awn-applet-manager-glue.h \
 	$(MARSHALFILES) \
 	$(NULL)
 
@@ -76,6 +83,7 @@
 EXTRA_DIST = \
 	awn-app-dbus.xml \
 	awn-panel-dbus.xml \
+	awn-applet-manager-dbus.xml \
 	$(NULL)
 
 # vim: set ts=8 sts=8 sw=8 :
 
=== added file 'src/awn-applet-manager-dbus.xml'
--- src/awn-applet-manager-dbus.xml	1970-01-01 00:00:00 +0000
+++ src/awn-applet-manager-dbus.xml	2009-06-02 22:11:19 +0000
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<node name="/org/awnproject/Awn/UA">
+  <interface name="org.awnproject.Awn.UA">
+    <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="awn_ua"/>
+  
+    <!-- Methods -->
+    <method name="add_applet">
+      <arg name="name" type="s" direction="in" />
+      <arg name="uid" type="x" direction="in" />
+      <arg name="width" type="i" direction="in" />
+      <arg name="height" type="i" direction="in" />
+      <arg name="size_type" type="s" direction="in" />
+    </method>
+
+    <method name="get_all_server_flags">
+      <arg name="name" type="s" direction="in" />
+      <arg name="hash" type="a{ss}" direction="out" />
+    </method>
+
+  </interface>
+</node>
 
=== modified file 'src/awn-applet-manager.c'
--- src/awn-applet-manager.c	2009-07-09 07:12:27 +0000
+++ src/awn-applet-manager.c	2009-07-14 20:38:19 +0000
@@ -16,22 +16,26 @@
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA.
  *
  *  Author : Neil Jagdish Patel <[e-mail]>
- *
+ *bind
  */
 
 #include "config.h"
 
-#include <libawn/awn-config-bridge.h>
+#include <libawn/libawn.h>
+#include <dbus/dbus-glib.h>
+#include <dbus/dbus-glib-bindings.h>
 #include <libawn/awn-utils.h>
 #include <math.h>
 
 #include "awn-defines.h"
 #include "awn-applet-manager.h"
-
+#include "awn-ua-alignment.h"
 #include "awn-applet-proxy.h"
 #include "awn-throbber.h"
 #include "xutils.h"
 
+#define MAX_UA_LIST_ENTRIES 50
+
 G_DEFINE_TYPE (AwnAppletManager, awn_applet_manager, GTK_TYPE_BOX) 
 
 #define AWN_APPLET_MANAGER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE (obj, \
@@ -44,8 +48,15 @@
   AwnOrientation   orient;
   gint             offset;
   gint             size;
+  
   GSList          *applet_list;
 
+  /*ua_list does not serve the same purpose as the applet_list
+   It's a list of unique UA names plus their position in the panel
+   */ 
+  GSList          *ua_list;
+  GSList          *ua_active_list;
+  
   gboolean         docklet_mode;
   GtkWidget       *docklet_widget;
 
@@ -60,6 +71,7 @@
 
   /* Current box class */
   GtkWidgetClass  *klass;
+
 };
 
 enum 
@@ -71,6 +83,8 @@
   PROP_OFFSET,
   PROP_SIZE,
   PROP_APPLET_LIST,
+  PROP_UA_LIST,
+  PROP_UA_ACTIVE_LIST,
   PROP_EXPANDS
 };
 
@@ -123,6 +137,20 @@
                                AWN_GROUP_PANEL, AWN_PANEL_APPLET_LIST,
                                AWN_CONFIG_CLIENT_LIST_TYPE_STRING,
                                object, "applet_list");
+  awn_config_bridge_bind_list (bridge, priv->client,
+                               AWN_GROUP_PANEL, AWN_PANEL_UA_LIST,
+                               AWN_CONFIG_CLIENT_LIST_TYPE_STRING,
+                               object, "ua_list");
+  awn_config_bridge_bind_list (bridge, priv->client,
+                               AWN_GROUP_PANEL, AWN_PANEL_UA_ACTIVE_LIST,
+                               AWN_CONFIG_CLIENT_LIST_TYPE_STRING,
+                               object, "ua_active_list");
+  /*
+  ua_active_list should be empty when awn starts...
+   */
+  awn_config_client_set_list (priv->client,AWN_GROUP_PANEL, AWN_PANEL_UA_ACTIVE_LIST,
+                               AWN_CONFIG_CLIENT_LIST_TYPE_STRING,
+                               NULL, NULL);
 }
 
 static void
@@ -165,10 +193,15 @@
     case PROP_SIZE:
       g_value_set_int (value, priv->size);
       break;
-
     case PROP_APPLET_LIST:
       g_value_set_pointer (value, priv->applet_list);
       break;
+    case PROP_UA_LIST:
+      g_value_set_pointer (value, priv->ua_list);
+      break;
+    case PROP_UA_ACTIVE_LIST:
+      g_value_set_pointer (value, priv->ua_active_list);
+      break;
     case PROP_EXPANDS:
       g_value_set_boolean (value, priv->expands);
       break;
@@ -208,6 +241,16 @@
       priv->applet_list = g_value_get_pointer (value);
       awn_applet_manager_refresh_applets (manager);
       break;
+    case PROP_UA_LIST:
+      free_list (priv->ua_list);
+      priv->ua_list = g_value_get_pointer (value);
+      awn_applet_manager_refresh_applets (manager);
+      break;
+    case PROP_UA_ACTIVE_LIST:
+      free_list (priv->ua_active_list);
+      priv->ua_active_list = g_value_get_pointer (value);
+      awn_applet_manager_refresh_applets (manager);
+      break;      
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
   }
@@ -240,6 +283,8 @@
   G_OBJECT_CLASS (awn_applet_manager_parent_class)->dispose (object);
 }
 
+#include "awn-applet-manager-glue.h"
+
 static void
 awn_applet_manager_class_init (AwnAppletManagerClass *klass)
 {
@@ -294,6 +339,20 @@
                           G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 
   g_object_class_install_property (obj_class,
+    PROP_UA_LIST,
+    g_param_spec_pointer ("ua_list",
+                          "UA List",
+                          "The rememebered screenlet positions for this panel",
+                          G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (obj_class,
+    PROP_UA_ACTIVE_LIST,
+    g_param_spec_pointer ("ua-active-list",
+                          "UA Active List",
+                          "The list of acitve screenlets for this panel",
+                          G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (obj_class,
     PROP_EXPANDS,
     g_param_spec_boolean ("expands",
                           "Expands",
@@ -321,12 +380,18 @@
                  G_TYPE_NONE, 0);
  
   g_type_class_add_private (obj_class, sizeof (AwnAppletManagerPrivate));
+
+  dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (klass), 
+                                   &dbus_glib_awn_ua_object_info);
+
 }
 
 static void
 awn_applet_manager_init (AwnAppletManager *manager)
 {
   AwnAppletManagerPrivate *priv;
+  DBusGConnection *connection;
+  GError                *error = NULL;
 
   priv = manager->priv = AWN_APPLET_MANAGER_GET_PRIVATE (manager);
 
@@ -338,6 +403,21 @@
   priv->extra_widgets = g_hash_table_new (g_direct_hash, g_direct_equal);
 
   gtk_widget_show_all (GTK_WIDGET (manager));
+
+  /* Grab a connection to the bus */
+  connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
+  if (connection == NULL)
+  {
+    g_warning ("Unable to make connection to the D-Bus session bus: %s",
+               error->message);
+    g_error_free (error);
+    gtk_main_quit ();
+  }
+
+ dbus_g_connection_register_g_object (connection, 
+                                       AWN_DBUS_MANAGER_PATH, 
+					G_OBJECT (GTK_WIDGET (manager)));
+
 }
 
 GtkWidget *
@@ -505,7 +585,7 @@
     g_type_class_unref (priv->klass);
     priv->klass = NULL;
   }
-
+//  g_debug ("%s, orient = %d",__func__,priv->orient);
   switch (priv->orient)
   {
     case AWN_ORIENTATION_TOP:
@@ -547,7 +627,10 @@
   {
     g_free (l->data);
   }
-  g_slist_free (list);
+  if (list)
+  {
+    g_slist_free (list);
+  }
 }
 
 /*
@@ -647,6 +730,7 @@
   gint                     i = 0;
   gint                     applet_num = 0;
 
+  g_debug ("%s",__func__);
   if (!GTK_WIDGET_REALIZED (manager))
     return;
 
@@ -684,12 +768,14 @@
       continue;
     }
 
+//    g_debug ("%s:  %s, %s",__func__,tokens[0],tokens[1]);
     /* See if the applet already exists */
     applet = g_hash_table_lookup (priv->applets, tokens[1]);
 
     /* If not, create it */
     if (applet == NULL)
     {
+      g_debug ("applet does not exist");
       applet = create_applet (manager, tokens[0], tokens[1]);
       if (!applet)
       {
@@ -752,6 +838,7 @@
     gtk_box_pack_start (GTK_BOX (manager), widget, FALSE, FALSE, 0);
     /* caller is supposed to call gtk_widget_show! */
   }
+  g_print ("Gint : %i : ", pos);
   g_hash_table_replace (priv->extra_widgets, widget, GINT_TO_POINTER (pos));
 
   awn_applet_manager_refresh_applets (manager);
@@ -769,6 +856,159 @@
   }
 }
 
+/*DBUS*/
+/*
+  Description of this dbus interface.
+ 
+ 	@action(IFACE)
+	def add_applet (self, id, plug_id, width, height, size_type):
+		"""
+		Add an applet.
+		
+		id: A unique string used to identify the applet.
+		plug_id: The applet's gtk.Plug's xid.
+		width: A recommended width. This will be interpreted according to size_type.
+		height A recommended height. This will be interpreted according to size_type.
+		size_type: Determines the meaning of width and height.
+			May be one of the following values:
+			"scalable"- The applet may be resized as long as the width/height ratio is kept.
+			"static"- The applet should be displayed at exactly the size requested.
+			"static-width"-	The applet's width should remain static, and the server may change the height.
+			"static-height"- The applet's height should remain static, and the server may change the width.
+			"dynamic"- The applet may be resized to any size.
+		desktop_path: Path to the desktop file.
+		"""
+		# NOTE: Melange currently ignores the size_type parameter.
+		container = ToplevelContainer(plug_id, id, self, width, height,
+			size_type, backend=self.backend)
+		self.containers.append(container)
+*/
+gboolean
+awn_ua_add_applet (	AwnAppletManager *manager,
+			gchar     *name,
+      glong		  xid,
+			gint	    width,
+			gint      height,
+			gchar     *size_type,
+      GError   **error)
+{
+  g_return_val_if_fail (AWN_IS_APPLET_MANAGER (manager),FALSE);
+  g_return_val_if_fail ( (g_strcmp0(size_type,"scalable")==0 ) || 
+                     (g_strcmp0(size_type,"dynamic")==0 ), FALSE );
+  
+  GdkWindow* plugwin; 
+  AwnAppletManagerPrivate *priv = manager->priv;  
+  gint pos = g_slist_length (priv->applet_list);  
+  GdkNativeWindow native_window = (GdkNativeWindow) xid;
+  gchar * tmp = g_strdup_printf ("%s::%d",name,pos);
+  gchar * ua_list_entry = NULL;
+  GtkWidget  *ua_alignment;
+  double ua_ratio;  
+
+  /*
+   Is there an entry in ua_list for this particular screenlet instance(name).
+   The comparision function used ignores the position.
+   */
+  GSList * search = g_slist_find_custom (priv->ua_list,tmp,awn_ua_alignment_list_cmp);
+  if (search)
+  {
+    /*     There's already an entry in ua_list so use that.     */
+    GStrv tokens;
+    ua_list_entry = g_strdup (search->data) ;
+    g_free (tmp);
+    /*    Get the position where the screenlet should be placed*/
+    tokens = g_strsplit (search->data,"::",2);
+    if (tokens && tokens[1])
+    {
+      pos = atoi (tokens[1]);
+    }
+    g_strfreev (tokens);
+    /* remove the link... that data will be appended at to the list*/
+    g_free (search->data);
+    priv->ua_list = g_slist_delete_link (priv->ua_list,search);
+    search = NULL;
+  }
+  else
+  {
+    /*
+     This screenlet instance is not recorded in ua_list.  It will end up being
+     placed at the end of the bar
+     */
+    ua_list_entry = tmp;
+  }
+  
+  /*
+   Calculated here and passed to the awn_ua_alignment_new().  AwnUAAlignment
+   could recalculate the ratio on bar resizes based on the, then current,
+   dimensions of the widget but over time the amount of error in the the 
+   calcs would increase
+   */
+  ua_ratio = width / (double) height;
+  ua_alignment = awn_ua_alignment_new(manager,ua_list_entry,ua_ratio); 
+
+  g_signal_connect_swapped (awn_ua_alignment_get_socket(AWN_UA_ALIGNMENT(ua_alignment)), 
+                            "plug-added",
+                            G_CALLBACK (_applet_plug_added),
+                            manager);
+
+  awn_applet_manager_add_widget(manager, GTK_WIDGET (ua_alignment), pos);
+  gtk_widget_show_all (ua_alignment);
+
+  plugwin = awn_ua_alignment_add_id (AWN_UA_ALIGNMENT(ua_alignment),native_window);
+  
+  g_object_set_qdata (G_OBJECT (ua_alignment),
+                      priv->touch_quark, GINT_TO_POINTER (0));    
+
+  if (!plugwin)
+  {
+    g_warning ("UA Plug was not created within socket.");
+    gtk_widget_destroy (ua_alignment);
+    return FALSE;
+  }
+
+  /*
+   Either add the new entry into ua_list or move an existing entry to the 
+   end of ua_list_entry
+   */
+  priv->ua_list = g_slist_append (priv->ua_list,g_strdup(ua_list_entry));
+
+  /* Keep the length of ua_list reasonable */
+  if (g_slist_length (priv->ua_list) > MAX_UA_LIST_ENTRIES)
+  {
+    GSList * iter;
+    int i =  g_slist_length (priv->ua_list) - MAX_UA_LIST_ENTRIES;
+    for(iter = priv->ua_list; i && iter ; iter = priv->ua_list )
+    {
+      g_free (iter->data);
+      priv->ua_list = g_slist_delete_link (priv->ua_list,iter);
+      i--;
+    }
+  }
+  awn_config_client_set_list (priv->client,AWN_GROUP_PANEL, AWN_PANEL_UA_LIST,
+                               AWN_CONFIG_CLIENT_LIST_TYPE_STRING,
+                               priv->ua_list, NULL);
+  /*Add our newly active screenlet to thend of the active list */
+  priv->ua_active_list = g_slist_append (priv->ua_active_list,g_strdup(ua_list_entry));  
+  awn_config_client_set_list (priv->client,AWN_GROUP_PANEL, AWN_PANEL_UA_ACTIVE_LIST,
+                               AWN_CONFIG_CLIENT_LIST_TYPE_STRING,
+                               priv->ua_active_list, NULL);
+  
+  return TRUE;
+}
+
+gboolean
+awn_ua_get_all_server_flags (	AwnAppletManager *manager,
+				GHashTable *hash,
+				gchar     *name,
+				GError   **error)
+{
+/* Future function to return capability of the server
+For now, it return nothing*/
+return TRUE;
+}
+
+
+/*End DBUS*/
 void
 awn_applet_manager_show_applets (AwnAppletManager *manager)
 {
 
=== modified file 'src/awn-applet-manager.h'
--- src/awn-applet-manager.h	2009-07-08 20:38:35 +0000
+++ src/awn-applet-manager.h	2009-07-13 18:05:02 +0000
@@ -25,6 +25,7 @@
 #include <gtk/gtk.h>
 
 #include <libawn/awn-config-client.h>
+#include <libawn/awn-defines.h>
 
 #include "awn-panel.h"
 
@@ -82,9 +83,25 @@
 
 gboolean    awn_applet_manager_get_expands       (AwnAppletManager *manager);
 
-void        awn_applet_manager_set_applet_flags  (AwnAppletManager *manager,
-                                                  const gchar *uid,
-                                                  AwnAppletFlags flags);
+
+
+gboolean    awn_ua_get_all_server_flags 	(AwnAppletManager *manager,
+						GHashTable *hash,
+						gchar     *name,
+						GError   **error);
+
+gboolean    awn_ua_add_applet (	AwnAppletManager *manager,
+		        gchar     *name,
+            glong		  xid,
+		        gint	    width,
+		        gint      height,
+		        gchar     *size_type,
+            GError   **error);
+
+
+void        awn_applet_manager_set_applet_flags (AwnAppletManager *manager,
+                                     const gchar *uid,
+                                     AwnAppletFlags flags);
 
 void        awn_applet_manager_show_applets      (AwnAppletManager *manager);
 void        awn_applet_manager_hide_applets      (AwnAppletManager *manager);
 
=== modified file 'src/awn-applet-proxy.c'
--- src/awn-applet-proxy.c	2009-07-08 21:17:59 +0000
+++ src/awn-applet-proxy.c	2009-07-13 18:05:02 +0000
@@ -276,6 +276,7 @@
         1, G_TYPE_INT);
 
   g_type_class_add_private (obj_class, sizeof (AwnAppletProxyPrivate));
+
 }
 
 static gboolean
@@ -349,6 +350,8 @@
   return proxy;
 }
 
+
+
 /*
  * GtkSocket callbacks
  */
@@ -552,4 +555,3 @@
     priv->idle_id = g_idle_add (awn_applet_proxy_idle_cb, proxy);
   }
 }
-
 
=== modified file 'src/awn-defines.h'
--- src/awn-defines.h	2009-04-18 00:36:20 +0000
+++ src/awn-defines.h	2009-07-14 18:01:40 +0000
@@ -28,6 +28,7 @@
 
 #define AWN_DBUS_APP_PATH   AWN_DBUS_PATH
 #define AWN_DBUS_PANEL_PATH AWN_DBUS_PATH"/Panel"
+#define AWN_DBUS_MANAGER_PATH AWN_DBUS_PATH"/UA"
 
 /* FIXME: Move some of these out into libawn when we can */
 #define AWN_GROUP_PANEL          "panel"
@@ -38,6 +39,8 @@
 #define AWN_PANEL_SIZE           "size"
 #define AWN_PANEL_AUTOHIDE       "autohide"
 #define AWN_PANEL_APPLET_LIST    "applet_list"
+#define AWN_PANEL_UA_LIST        "ua_list"
+#define AWN_PANEL_UA_ACTIVE_LIST "ua_active_list"
 #define AWN_PANEL_MONITOR_HEIGHT "monitor_height"
 #define AWN_PANEL_MONITOR_WIDTH  "monitor_width"
 #define AWN_PANEL_MONITOR_FORCE  "monitor_force"
 
=== added file 'src/awn-ua-alignment.c'
--- src/awn-ua-alignment.c	1970-01-01 00:00:00 +0000
+++ src/awn-ua-alignment.c	2009-07-14 19:09:25 +0000
@@ -0,0 +1,469 @@
+/*
+ *  Copyright (C) 2009 Rodney Cryderman <[e-mail]>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA.
+ *
+ *
+ */
+
+/* awn-ua-alignment.c */
+#include <stdlib.h>
+#include "awn-ua-alignment.h"
+#include "awn-defines.h"
+
+G_DEFINE_TYPE (AwnUAAlignment, awn_ua_alignment, GTK_TYPE_ALIGNMENT)
+
+#define AWN_UA_ALIGNMENT_GET_PRIVATE(o) \
+  (G_TYPE_INSTANCE_GET_PRIVATE ((o), AWN_TYPE_UA_ALIGNMENT, AwnUAAlignmentPrivate))
+
+typedef struct _AwnUAAlignmentPrivate AwnUAAlignmentPrivate;
+
+struct _AwnUAAlignmentPrivate
+{
+  GtkWidget * socket;
+  GtkWidget * applet_manager;
+  
+  gchar       *ua_list_entry;
+  double      ua_ratio;
+  
+  guint       notify_size_id;
+  guint       notify_orient_id;
+  guint       notify_offset_id;
+  guint       notify_ua_list_id;
+};
+
+enum
+{
+  PROP_0,
+  PROP_APPLET_MANAGER,
+  PROP_UA_LIST_ENTRY,
+  PROP_UA_RATIO
+};
+
+
+static gboolean awn_ua_alignment_plug_removed (GtkWidget * socket,
+                                               AwnUAAlignment * self);
+static void awn_ua_alignment_list_change(GObject *object,
+                                         GParamSpec *param_spec,
+                                         gpointer user_data);
+static void awn_ua_alignment_orient_change(GObject *object,
+                                           GParamSpec *param_spec,
+                                           gpointer user_data);
+static void awn_ua_alignment_size_change(GObject *object,
+                                         GParamSpec *param_spec,
+                                         gpointer user_data);
+static void awn_ua_alignment_offset_change(GObject *object,
+                                           GParamSpec *param_spec,
+                                           gpointer user_data);
+
+
+static void
+awn_ua_alignment_get_property (GObject *object, guint property_id,
+                              GValue *value, GParamSpec *pspec)
+{
+  AwnUAAlignmentPrivate * priv;
+
+  priv =  AWN_UA_ALIGNMENT_GET_PRIVATE (object);
+  
+  switch (property_id) 
+  {
+    case PROP_APPLET_MANAGER:
+      g_value_set_object (value,priv->applet_manager);
+      break;
+    case PROP_UA_LIST_ENTRY:
+      g_value_set_string (value,priv->ua_list_entry);
+      break;
+    case PROP_UA_RATIO:
+      g_value_set_double (value,priv->ua_ratio);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+  }
+}
+
+static void
+awn_ua_alignment_set_property (GObject *object, guint property_id,
+                              const GValue *value, GParamSpec *pspec)
+{
+  AwnUAAlignmentPrivate * priv;
+
+  priv =  AWN_UA_ALIGNMENT_GET_PRIVATE (object);
+  switch (property_id) 
+  {
+    case PROP_APPLET_MANAGER:
+      priv->applet_manager = g_value_get_object (value);
+      break;
+    case PROP_UA_LIST_ENTRY:
+      g_free (priv->ua_list_entry);
+      priv->ua_list_entry = g_value_dup_string (value);
+      break;
+    case PROP_UA_RATIO:
+      priv->ua_ratio = g_value_get_double (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+  }
+}
+
+static void
+awn_ua_alignment_dispose (GObject *object)
+{
+  G_OBJECT_CLASS (awn_ua_alignment_parent_class)->dispose (object);
+}
+
+static void
+awn_ua_alignment_finalize (GObject *object)
+{
+  AwnUAAlignmentPrivate * priv =  AWN_UA_ALIGNMENT_GET_PRIVATE (object);  
+  g_debug ("%s",__func__);
+  if (priv->ua_list_entry)
+  {
+    g_free (priv->ua_list_entry);
+  }
+  G_OBJECT_CLASS (awn_ua_alignment_parent_class)->finalize (object);
+}
+
+static void
+awn_ua_alignment_constructed (GObject *object)
+{
+  AwnUAAlignmentPrivate * priv =  AWN_UA_ALIGNMENT_GET_PRIVATE (object);
+
+  if (G_OBJECT_CLASS (awn_ua_alignment_parent_class)->constructed)
+  {
+    G_OBJECT_CLASS (awn_ua_alignment_parent_class)->constructed (object);
+  }
+
+  gtk_container_add (GTK_CONTAINER(object),priv->socket);
+  awn_ua_alignment_orient_change (NULL,NULL,object);  
+  priv->notify_offset_id = g_signal_connect (priv->applet_manager,
+                                            "notify::offset",
+                                            G_CALLBACK(awn_ua_alignment_offset_change),
+                                            object);
+  priv->notify_orient_id = g_signal_connect_after (priv->applet_manager,
+                                            "notify::orient",
+                                            G_CALLBACK(awn_ua_alignment_orient_change),
+                                            object);
+  priv->notify_size_id = g_signal_connect_after (priv->applet_manager,
+                                            "notify::size",
+                                            G_CALLBACK(awn_ua_alignment_size_change),
+                                            object);
+  priv->notify_ua_list_id = g_signal_connect_after (priv->applet_manager,
+                                           "notify::ua-active-list",
+                                           G_CALLBACK(awn_ua_alignment_list_change),
+                                           object);
+}
+
+static void
+awn_ua_alignment_class_init (AwnUAAlignmentClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GParamSpec   *pspec;
+
+  object_class->get_property = awn_ua_alignment_get_property;
+  object_class->set_property = awn_ua_alignment_set_property;
+  object_class->dispose = awn_ua_alignment_dispose;
+  object_class->finalize = awn_ua_alignment_finalize;
+  object_class->constructed = awn_ua_alignment_constructed;  
+  
+  pspec = g_param_spec_object ("applet-manager",
+                               "Awn Applet Manager",
+                               "Awn Applet Manager",
+                               AWN_TYPE_APPLET_MANAGER,
+                               G_PARAM_READWRITE | G_PARAM_CONSTRUCT);
+  g_object_class_install_property (object_class, PROP_APPLET_MANAGER, pspec);   
+  
+  pspec = g_param_spec_string ("ua-list-entry",
+                               "UA List entry",
+                               "UA List entry",
+                               NULL,
+                               G_PARAM_READWRITE | G_PARAM_CONSTRUCT);
+  g_object_class_install_property (object_class, PROP_UA_LIST_ENTRY, pspec);   
+  
+  pspec = g_param_spec_double ("ua-ratio",
+                               "UA Ratio",
+                               "UA Ratio",
+                               0.0,
+                               100.0,
+                               1.0,
+                               G_PARAM_READWRITE | G_PARAM_CONSTRUCT);
+  g_object_class_install_property (object_class, PROP_UA_RATIO, pspec);   
+
+  g_type_class_add_private (klass, sizeof (AwnUAAlignmentPrivate));  
+}
+
+static void
+awn_ua_alignment_init (AwnUAAlignment *self)
+{
+  AwnUAAlignmentPrivate *priv;
+
+  priv =  AWN_UA_ALIGNMENT_GET_PRIVATE (self); 
+  priv->socket = gtk_socket_new ();
+}
+
+GtkWidget*
+awn_ua_alignment_new (AwnAppletManager *manager,gchar * ua_list_entry,double ua_ratio)
+{
+  return g_object_new (AWN_TYPE_UA_ALIGNMENT,
+                       "applet-manager",manager,
+                       "ua-list-entry",ua_list_entry,
+                       "ua-ratio",ua_ratio,
+                       NULL);
+}
+
+GtkWidget*
+awn_ua_alignment_get_socket (AwnUAAlignment *self)
+{
+  AwnUAAlignmentPrivate *priv;
+
+  priv =  AWN_UA_ALIGNMENT_GET_PRIVATE (self); 
+  return priv->socket;
+}
+
+
+GdkWindow *
+awn_ua_alignment_add_id (AwnUAAlignment *self,GdkNativeWindow native_window)
+{
+  GdkWindow * plugwin;
+  AwnUAAlignmentPrivate *priv;
+
+  priv =  AWN_UA_ALIGNMENT_GET_PRIVATE (self); 
+  gtk_socket_add_id (GTK_SOCKET(priv->socket), native_window);
+  plugwin = gtk_socket_get_plug_window (GTK_SOCKET(priv->socket));
+  g_signal_connect (priv->socket,"plug-removed",
+                    G_CALLBACK(awn_ua_alignment_plug_removed),self);
+  gtk_widget_realize (priv->socket);
+  gtk_widget_show_all (priv->socket);
+  return plugwin;
+}
+
+
+static gboolean
+awn_ua_alignment_plug_removed (GtkWidget * socket,AwnUAAlignment * self)
+{
+
+  GSList * search;
+  GSList * ua_active_list;
+  GSList * orig_active_list;
+  GSList * iter;
+  AwnConfigClient *client;
+  
+  AwnUAAlignmentPrivate *priv = AWN_UA_ALIGNMENT_GET_PRIVATE (self); 
+  
+  g_signal_handler_disconnect (priv->applet_manager,priv->notify_size_id);
+  g_signal_handler_disconnect (priv->applet_manager,priv->notify_orient_id);
+  g_signal_handler_disconnect (priv->applet_manager,priv->notify_offset_id);
+  g_signal_handler_disconnect (priv->applet_manager,priv->notify_ua_list_id);
+
+  g_object_get ( priv->applet_manager,
+                "ua_active_list",&orig_active_list,
+                "client",&client,
+                NULL);
+  ua_active_list = g_slist_copy (orig_active_list);
+  for (iter = ua_active_list;iter;iter = iter->next)
+  {
+    iter->data = g_strdup(iter->data);
+  }
+  search = g_slist_find_custom (ua_active_list,priv->ua_list_entry,
+                                (GCompareFunc)g_strcmp0);
+  if (search)
+  {
+    ua_active_list = g_slist_delete_link (ua_active_list,search);
+  } 
+  awn_config_client_set_list (client,AWN_GROUP_PANEL, AWN_PANEL_UA_ACTIVE_LIST,
+                             AWN_CONFIG_CLIENT_LIST_TYPE_STRING,
+                             ua_active_list, NULL); 
+  g_object_set (priv->applet_manager,
+                "ua-active-list",ua_active_list,
+                NULL);
+  awn_applet_manager_remove_widget(AWN_APPLET_MANAGER(priv->applet_manager), 
+                               GTK_WIDGET (self));        
+  return FALSE;
+}
+
+/*UA*/
+gint
+awn_ua_alignment_list_cmp (gconstpointer a, gconstpointer b)
+{
+  const gchar * str1 = a;
+  const gchar * str2 = b;
+  gchar * search = NULL;
+  GStrv tokens = g_strsplit (str1,"::",2);
+  g_return_val_if_fail (tokens,-1);
+  
+  search = g_strstr_len (str2,-1,tokens[0]);
+  g_strfreev (tokens);
+  
+  if (!search)
+  {
+    return -1;
+  };
+  return 0;
+}
+
+static void
+awn_ua_alignment_offset_change(GObject *object,GParamSpec *param_spec,gpointer user_data)
+{
+  AwnUAAlignment * self = user_data;  
+  gint offset;
+  gint orient;
+  AwnUAAlignmentPrivate *priv = AWN_UA_ALIGNMENT_GET_PRIVATE (self); 
+  
+  g_object_get ( priv->applet_manager,
+                "offset",&offset,
+                "orient",&orient,
+                NULL);
+  
+  switch (orient)
+  {
+    case AWN_ORIENTATION_TOP:
+      gtk_alignment_set_padding (GTK_ALIGNMENT(self), offset, 0, 0, 0);
+      break;
+    case AWN_ORIENTATION_BOTTOM:
+      gtk_alignment_set_padding (GTK_ALIGNMENT(self), 0, offset, 0, 0);
+      break;
+    case AWN_ORIENTATION_LEFT:
+      gtk_alignment_set_padding (GTK_ALIGNMENT(self), 0, 0, offset, 0);
+      break;
+    case AWN_ORIENTATION_RIGHT:
+      gtk_alignment_set_padding (GTK_ALIGNMENT(self), 0, 0, 0, offset);
+      break;
+    default:
+      g_warning ("%s: recieved invalid orient %d",__func__,orient);
+  }
+}
+
+static void
+awn_ua_alignment_size_change(GObject *object,GParamSpec *param_spec,gpointer user_data)
+{
+  AwnUAAlignment * self = user_data;  
+  gint offset;
+  gint orient;
+  gint size;
+  AwnUAAlignmentPrivate *priv = AWN_UA_ALIGNMENT_GET_PRIVATE (self); 
+  
+  g_object_get ( priv->applet_manager,
+                "offset",&offset,
+                "orient",&orient,
+                "size",&size,
+                NULL);
+  GtkRequisition  req;
+
+  req.width = req.height = size;
+  switch (orient)
+  {
+    case AWN_ORIENTATION_TOP:
+    case AWN_ORIENTATION_BOTTOM:      
+      req.width = size * priv->ua_ratio;
+      req.height = size;
+      break;
+    case AWN_ORIENTATION_LEFT:
+    case AWN_ORIENTATION_RIGHT:
+      req.width = size;
+      req.height = size  * 1.0 / priv->ua_ratio;            
+      break;
+    default:
+      g_warning ("%s: recieved invalid orient %d",__func__,orient);
+  }
+  gtk_widget_set_size_request (GTK_WIDGET(self),req.width,req.height);
+}
+
+static void
+awn_ua_alignment_orient_change(GObject *object,GParamSpec *param_spec,gpointer user_data)
+{
+  
+  AwnUAAlignment * self = user_data;  
+  gint orient;
+  AwnUAAlignmentPrivate *priv = AWN_UA_ALIGNMENT_GET_PRIVATE (self); 
+  
+  g_object_get ( priv->applet_manager,
+                "orient",&orient,
+                NULL);
+  switch (orient)
+  {
+    case AWN_ORIENTATION_TOP:
+      gtk_alignment_set (GTK_ALIGNMENT(self), 0.0, 0.0, 1.0, 0.5);
+      break;
+    case AWN_ORIENTATION_BOTTOM:
+      gtk_alignment_set (GTK_ALIGNMENT(self), 0.0, 1.0, 1.0, 0.5);
+      break;
+    case AWN_ORIENTATION_LEFT:
+      gtk_alignment_set (GTK_ALIGNMENT(self), 0.0, 0.0, 0.5, 1.0);
+      break;
+    case AWN_ORIENTATION_RIGHT:
+      gtk_alignment_set (GTK_ALIGNMENT(self), 1.0, 0.0, 0.5, 1.0);
+      break;
+    default:
+      g_warning ("%s: recieved invalid orient %d",__func__,orient);
+  }
+  awn_ua_alignment_offset_change (object,param_spec,self);
+  awn_ua_alignment_size_change (object,param_spec,self);
+}
+
+static void
+awn_ua_alignment_list_change(GObject *object,GParamSpec *param_spec,gpointer user_data)
+{
+  AwnUAAlignment * self = user_data;  
+  gint orient;
+  AwnUAAlignmentPrivate *priv = AWN_UA_ALIGNMENT_GET_PRIVATE (self); 
+  GSList * ua_active_list;
+  
+  g_object_get ( priv->applet_manager,
+                "orient",&orient,
+                "ua_active_list",&ua_active_list,
+                NULL);
+
+  GSList * search = g_slist_find_custom (ua_active_list,
+                                         priv->ua_list_entry,
+                                         (GCompareFunc)g_strcmp0);  
+  if (search)
+  {
+    g_debug ("Found... do not need to update %s",priv->ua_list_entry);
+  }
+  else
+  {
+    search = g_slist_find_custom (ua_active_list,priv->ua_list_entry,awn_ua_alignment_list_cmp);
+    if (search)
+    {
+      g_debug ("Moving %s to %s",priv->ua_list_entry,(gchar*)search->data);
+      GStrv tokens;
+      gint pos = -1;
+      g_free (priv->ua_list_entry);
+      priv->ua_list_entry = g_strdup(search->data);
+      tokens = g_strsplit (search->data,"::",2);
+      if (tokens && tokens[1])
+      {
+        pos = atoi (tokens[1]);
+      }
+      g_strfreev (tokens);
+      if (pos != -1)
+      {
+        awn_applet_manager_add_widget(AWN_APPLET_MANAGER(priv->applet_manager),
+                                      GTK_WIDGET (self), 
+                                      pos);
+      }
+    }
+    else
+    {
+      g_debug ("looks like  %s was removed from panel/ua_list",priv->ua_list_entry);
+      /*
+       aantn as expected this does not kill the screenlet.  What is the best way to
+       tell it that we want it to go away?
+       */
+      awn_applet_manager_remove_widget(AWN_APPLET_MANAGER(priv->applet_manager), 
+                                   GTK_WIDGET (self));        
+      gtk_widget_destroy (GTK_WIDGET(self));
+    } 
+  }  
+}
 
=== added file 'src/awn-ua-alignment.h'
--- src/awn-ua-alignment.h	1970-01-01 00:00:00 +0000
+++ src/awn-ua-alignment.h	2009-07-14 02:56:28 +0000
@@ -0,0 +1,68 @@
+/*
+ *  Copyright (C) 2009 Rodney Cryderman <[e-mail]>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA.
+ *
+ *
+ */
+
+/* awn-ua-alignment.h */
+
+#ifndef _AWN_UA_ALIGNMENT
+#define _AWN_UA_ALIGNMENT
+
+#include <gtk/gtk.h>
+#include "awn-applet-manager.h"
+
+G_BEGIN_DECLS
+
+#define AWN_TYPE_UA_ALIGNMENT awn_ua_alignment_get_type()
+
+#define AWN_UA_ALIGNMENT(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), AWN_TYPE_UA_ALIGNMENT, AwnUAAlignment))
+
+#define AWN_UA_ALIGNMENT_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), AWN_TYPE_UA_ALIGNMENT, AwnUAAlignmentClass))
+
+#define AWN_IS_UA_ALIGNMENT(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), AWN_TYPE_UA_ALIGNMENT))
+
+#define AWN_IS_UA_ALIGNMENT_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), AWN_TYPE_UA_ALIGNMENT))
+
+#define AWN_UA_ALIGNMENT_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), AWN_TYPE_UA_ALIGNMENT, AwnUAAlignmentClass))
+
+typedef struct {
+  GtkAlignment parent;
+} AwnUAAlignment;
+
+typedef struct {
+  GtkAlignmentClass parent_class;
+} AwnUAAlignmentClass;
+
+GType awn_ua_alignment_get_type (void);
+
+GtkWidget* awn_ua_alignment_new (AwnAppletManager *manager,gchar * ua_list_entry,double ua_ratio);
+
+GtkWidget* awn_ua_alignment_get_socket (AwnUAAlignment *self);
+
+GdkWindow * awn_ua_alignment_add_id (AwnUAAlignment *self, GdkNativeWindow native_window);
+
+gint awn_ua_alignment_list_cmp (gconstpointer a, gconstpointer b);
+
+G_END_DECLS
+
+#endif /* _AWN_UA_ALIGNMENT */