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

[Michal Hruby]

[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.

[Mark Lee (malept)]

review: Approve (superreview)

[Michal Hruby (mhr3)]

Here are my comments (all line numbers are from merge diff at LP):

1) Please remove applets/uawrapper/*
2) Do we really need both ua_list and ua_active_list to be saved in config client? There's for example a comment that ua_active_list must be empty when AWN starts, so does it really have to be saved to permanent config?
3) Please remove the g_debugs (for example 876), don't just comment them out (if not necessary for future development) - ok, most seem to be gone now.
4) Why is touch_quark set on UaAlignment (line 599)?
5) The UA has its special DBus object AND interface, I think it should be part of the instanced Panel object (though a separate interface). Currently it is multipanel-unfriendly. This would also remove the need to add dbus-specifics to AppletManager (*-glue.h and changes to Makefile.am)
6) get_all_server_flags method looks suspicious - hash table is not allocated, but TRUE is returned. (line 639)
7) There are mixed tabs/spaces in awn-applet-manager.h
8) Please revert the whitespace changes to awn-applet-proxy.c
9) Wouldn't it be better if instead of each UaAlignment watching the ua-active-list, the AppletManager would do it? The logic behind is very similar to applet watching, so it does make sense to put it into AppletManager. (moreover it'd be a little faster)
10) Why are the x/y-scale in gtk_alignment_set sometimes set to 0.5 (line 1142)?

review: Needs Fixing (detailed)

[moonbeam (rcryderman)]

> Here are my comments (all line numbers are from merge diff at LP):
>
> 1) Please remove applets/uawrapper/*
Done

> 2) Do we really need both ua_list and ua_active_list to be saved in config
> client? There's for example a comment that ua_active_list must be empty
> AWN starts, so does it really have to be saved to permanent config?
Yes, unfortunately we do. At least for the moment. Admittedly ua_active_list is ephemeral in nature. It exists so awn-settings can be used to manipulate the active screenlets.

> 3) Please remove the g_debugs (for example 876), don't just comment them out
> (if not necessary for future development) - ok, most seem to be gone now.'s
There are still a few kicking around at the moment. I'd like to keep those specific ones in a bit longer.

> 4) Why is touch_quark set on UaAlignment (line 599)?
Leftover from duplication of code in create_applet(). I'll remove it.

> 5) The UA has its special DBus object AND interface, I think it should be part
> of the instanced Panel object (though a separate interface). Currently it is
> multipanel-unfriendly. This would also remove the need to add dbus-specifics
> to AppletManager (*-glue.h and changes to Makefile.am)
Beyond my time and abilities to do. Though I know we would like to keep the 0.4 mult-panel friendly I feel this can be dealt with in the 0.6 cycle.

> 6) get_all_server_flags method looks suspicious - hash table is not allocated,
> but TRUE is returned. (line 639)
Changed to return FALSE.

> 7) There are mixed tabs/spaces in awn-applet-manager.h

> 8) Please revert the whitespace changes to awn-applet-proxy.c
Missed those.

> 9) Wouldn't it be better if instead of each UaAlignment watching the ua-
> active-list, the AppletManager would do it? The logic behind is very similar
> to applet watching, so it does make sense to put it into AppletManager.
> (moreover it'd be a little faster)
Maybe. I gave consideration to leaving it ther, it could have went either way. I chose to move as much into UAAlignment as possible for the moment. My inclination is to leave it as it is for now but possibly move it back into AppletManager at a later date.

> 10) Why are the x/y-scale in gtk_alignment_set sometimes set to 0.5 (line
> 1142)?
Probably because they worked fine that way:-) I'l fix that before I push the changes.

[moonbeam (rcryderman)]

Turns out they are necessary for proper placement of the UA/screenlet.

> > 10) Why are the x/y-scale in gtk_alignment_set sometimes set to 0.5 (line
> > 1142)?
> Probably because they worked fine that way:-) I'l fix that before I push the
> changes.

[Julien Lavergne (gilir)]

About the dbus stuff, changing the interface sound possible, the
necessary stuff to do on screenlets's side shoudl not be too hard.

I need to take another look for the AppletManager code.

Julien Lavergne

Le 16 juil. 2009 à 16:27, moonbeam <email address hidden> a écrit :

>> Here are my comments (all line numbers are from merge diff at LP):
>>
>> 1) Please remove applets/uawrapper/*
> Done
>
>> 2) Do we really need both ua_list and ua_active_list to be saved in
>> config
>> client? There's for example a comment that ua_active_list must be
>> empty
>> AWN starts, so does it really have to be saved to permanent config?
> Yes, unfortunately we do. At least for the moment. Admittedly
> ua_active_list is ephemeral in nature. It exists so awn-settings
> can be used to manipulate the active screenlets.
>
>> 3) Please remove the g_debugs (for example 876), don't just comment
>> them out
>> (if not necessary for future development) - ok, most seem to be
>> gone now.'s
> There are still a few kicking around at the moment. I'd like to
> keep those specific ones in a bit longer.
>
>> 4) Why is touch_quark set on UaAlignment (line 599)?
> Leftover from duplication of code in create_applet(). I'll remove it.
>
>> 5) The UA has its special DBus object AND interface, I think it
>> should be part
>> of the instanced Panel object (though a separate interface).
>> Currently it is
>> multipanel-unfriendly. This would also remove the need to add dbus-
>> specifics
>> to AppletManager (*-glue.h and changes to Makefile.am)
> Beyond my time and abilities to do. Though I know we would like to
> keep the 0.4 mult-panel friendly I feel this can be dealt with in
> the 0.6 cycle.
>
>> 6) get_all_server_flags method looks suspicious - hash table is not
>> allocated,
>> but TRUE is returned. (line 639)
> Changed to return FALSE.
>
>> 7) There are mixed tabs/spaces in awn-applet-manager.h
>
>> 8) Please revert the whitespace changes to awn-applet-proxy.c
> Missed those.
>
>> 9) Wouldn't it be better if instead of each UaAlignment watching
>> the ua-
>> active-list, the AppletManager would do it? The logic behind is
>> very similar
>> to applet watching, so it does make sense to put it into
>> AppletManager.
>> (moreover it'd be a little faster)
> Maybe. I gave consideration to leaving it ther, it could have went
> either way. I chose to move as much into UAAlignment as possible
> for the moment. My inclination is to leave it as it is for now but
> possibly move it back into AppletManager at a later date.
>
>> 10) Why are the x/y-scale in gtk_alignment_set sometimes set to 0.5
>> (line
>> 1142)?
> Probably because they worked fine that way:-) I'l fix that before I
> push the changes.
>
> --
> https://code.launchpad.net/~awn-testing/awn/awn-rewrite-ua-support/+merge/8851
> You proposed lp:~awn-testing/awn/awn-rewrite-ua-support for merging.

[Michal Hruby (mhr3)]

From my point of view it's good to go, but someone please test with the actual UA before merging, since there were changes to the DBus interface (btw shouldn't there be a standardized name for the UA interface?).

review: Approve

[Mark Lee (malept)]

review: Approve (superreview)

=== modified file 'awn-settings/awnClass.py'
--- awn-settings/awnClass.py	2009-07-15 20:40:32 +0000
+++ awn-settings/awnClass.py	2009-07-16 15:04:17 +0000
@@ -1541,16 +1541,23 @@
             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)
+        self.client.set_list(defs.PANEL, defs.UA_LIST, awn.CONFIG_LIST_STRING, ua_list)
 
     def up_clicked (self, button):
         select = self.treeview.get_selection()
@@ -1596,18 +1603,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;
+            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()
@@ -1649,7 +1670,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-15 20:43:31 +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 'src/Makefile.am'
--- src/Makefile.am	2009-06-21 13:23:05 +0000
+++ src/Makefile.am	2009-07-17 22:02:30 +0000
@@ -51,6 +51,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 \
 
=== 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-17 22:13:45 +0000
@@ -21,17 +21,19 @@
 
 #include "config.h"
 
-#include <libawn/awn-config-bridge.h>
+#include <libawn/libawn.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 +46,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 +69,7 @@
 
   /* Current box class */
   GtkWidgetClass  *klass;
+
 };
 
 enum 
@@ -71,6 +81,8 @@
   PROP_OFFSET,
   PROP_SIZE,
   PROP_APPLET_LIST,
+  PROP_UA_LIST,
+  PROP_UA_ACTIVE_LIST,
   PROP_EXPANDS
 };
 
@@ -123,6 +135,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 +191,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 +239,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);
   }
@@ -294,6 +335,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",
@@ -505,7 +560,6 @@
     g_type_class_unref (priv->klass);
     priv->klass = NULL;
   }
-
   switch (priv->orient)
   {
     case AWN_ORIENTATION_TOP:
@@ -547,7 +601,10 @@
   {
     g_free (l->data);
   }
-  g_slist_free (list);
+  if (list)
+  {
+    g_slist_free (list);
+  }
 }
 
 /*
@@ -653,7 +710,7 @@
   if (priv->applet_list == NULL)
   {
     g_debug ("No applets");
-    return;
+    return; // FIXME: removing last applet doesn't work because of this
   }
 
   guint applet_count = g_slist_length (priv->applet_list);
@@ -769,6 +826,155 @@
   }
 }
 
+/*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);
+  
+  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)
+{
+  *hash = g_hash_table_new(g_str_hash,g_str_equal);
+/* 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-17 22:02:30 +0000
@@ -25,6 +25,7 @@
 #include <gtk/gtk.h>
 
 #include <libawn/awn-config-client.h>
+#include <libawn/awn-defines.h>
 
 #include "awn-panel.h"
 
@@ -96,6 +97,19 @@
                                                   AwnPathType path_type,
                                                   gfloat offset_modifier);
 
+/* UA stuff */
+
+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);
+
 G_END_DECLS
 
 #endif /* _AWN_APPLET_MANAGER_H */
 
=== 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"
 
=== modified file 'src/awn-panel-dbus.xml'
--- src/awn-panel-dbus.xml	2009-06-26 10:09:15 +0000
+++ src/awn-panel-dbus.xml	2009-07-17 22:02:30 +0000
@@ -69,4 +69,23 @@
     <property name="PanelXid" type="x" access="read" />
 
   </interface>
+
+  <interface name="org.awnproject.Awn.UA">
+    <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="awn_panel"/>
+
+    <!-- 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-panel.c'
--- src/awn-panel.c	2009-07-12 01:04:30 +0000
+++ src/awn-panel.c	2009-07-17 22:10:27 +0000
@@ -316,6 +316,7 @@
 
 static gboolean awn_panel_set_drag_proxy    (AwnPanel *panel,
                                              gboolean check_mouse_pos);
+
 /*
  * GOBJECT CODE 
  */
@@ -2891,3 +2892,33 @@
   dbus_g_method_return (context, window_id);
 }
 
+gboolean
+awn_panel_get_all_server_flags (AwnPanel *panel,
+                                GHashTable **hash,
+                                gchar     *name,
+                                GError   **error)
+{
+  AwnPanelPrivate *priv;
+
+  g_return_val_if_fail (AWN_IS_PANEL (panel), FALSE);
+  priv = panel->priv;
+
+  return awn_ua_get_all_server_flags (AWN_APPLET_MANAGER (priv->manager),
+                                      hash, name, error);
+}
+
+gboolean
+awn_panel_add_applet (AwnPanel *panel, gchar *name, glong xid,
+                      gint width, gint height,
+                      gchar *size_type,
+                      GError **error)
+{
+  AwnPanelPrivate *priv;
+
+  g_return_val_if_fail (AWN_IS_PANEL (panel), FALSE);
+  priv = panel->priv;
+
+  return awn_ua_add_applet (AWN_APPLET_MANAGER (priv->manager), name, xid,
+                            width, height, size_type, error);
+}
+
 
=== modified file 'src/awn-panel.h'
--- src/awn-panel.h	2009-06-26 10:09:15 +0000
+++ src/awn-panel.h	2009-07-17 22:10:27 +0000
@@ -107,6 +107,17 @@
                                            gboolean          expand,
                                            DBusGMethodInvocation *context);
 
+gboolean    awn_panel_get_all_server_flags(AwnPanel *panel,
+                                           GHashTable **hash,
+                                           gchar     *name,
+                                           GError   **error);
+
+gboolean    awn_panel_add_applet          (AwnPanel *panel,
+                                           gchar *name, glong xid,
+                                           gint width, gint height,
+                                           gchar *size_type,
+                                           GError **error);
+
 G_END_DECLS
 
 
 
=== 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-16 15:03:52 +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: received 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: received 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 (priv->socket);
+    } 
+  }  
+}
 
=== 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 */