Merge lp:~om26er/ubuntu/natty/unity/unity-fix-761409 into lp:~ubuntu-desktop/unity/natty

[Omer Akram]

backport the fix for bug 761409 the fix also went into lp:unity/3.0 but we are not sure when that release will happen.

[lp:~om26er/ubuntu/natty/unity/unity-fix-761409]

469. By Omer Akram on 2011-09-05

fix for lp: 816632

470. By Omer Akram on 2011-09-05

fix

[Bryce Harrington (bryce)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-08-10 10:27:20 +0000
+++ debian/changelog	2011-09-05 19:31:25 +0000
@@ -1,9 +1,19 @@
-unity (3.8.16-0ubuntu1~natty1.1) natty-proposed; urgency=low
+unity (3.8.16-0ubuntu1~natty3) natty-proposed; urgency=low
+
+  * src/PanelTray.cpp:
+  * src/PanelTray.h:
+    - make systray behave nice when the whitelist is on (LP: #761409)
+  * src/IndicatorObjectEntryProxyRemote.cpp:
+    - Fix leak of GMemoryInputStream. (thx hyperair) (LP: #816632)
+
+ -- Omer Akram <[e-mail]>  Tue, 06 Sep 2011 00:09:33 +0500
+
+unity (3.8.16-0ubuntu1~natty2) natty-proposed; urgency=low
 
   * src/Launcher.cpp:
     - Launcher does not autohide after drag in Qt apps. (LP: #769703)
 
- -- Omer Akram <[e-mail]>  Wed, 10 Aug 2011 15:24:51 +0500
+ -- Omer Akram <[e-mail]>  Mon, 15 Aug 2011 16:26:52 +0500
 
 unity (3.8.16-0ubuntu1~natty1) natty-proposed; urgency=low
 

=== modified file 'src/IndicatorObjectEntryProxyRemote.cpp'
--- src/IndicatorObjectEntryProxyRemote.cpp	2011-04-08 07:53:45 +0000
+++ src/IndicatorObjectEntryProxyRemote.cpp	2011-09-05 19:31:25 +0000
@@ -67,7 +67,7 @@
       ret = gdk_pixbuf_new_from_stream (stream, NULL, NULL);
 
       g_free (decoded);
-      g_input_stream_close (stream, NULL, NULL);
+      g_object_unref (stream);
     }
   else if (_image_type == GTK_IMAGE_STOCK
            || _image_type == GTK_IMAGE_ICON_NAME)

=== modified file 'src/PanelTray.cpp'
--- src/PanelTray.cpp	2011-06-16 16:57:23 +0000
+++ src/PanelTray.cpp	2011-09-05 19:31:25 +0000
@@ -22,7 +22,7 @@
 #define PADDING 3
 
 PanelTray::PanelTray ()
-: _n_children (0),
+ :_window (0),
   _tray (NULL),
   _last_x (0),
   _last_y (0),
@@ -30,7 +30,12 @@
 {
   _settings = g_settings_new (SETTINGS_NAME);
   _whitelist = g_settings_get_strv (_settings, "systray-whitelist");
+ 
+  RealInit();
+}
 
+void PanelTray::RealInit()
+{
   _window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_type_hint (GTK_WINDOW (_window), GDK_WINDOW_TYPE_HINT_DOCK);
   gtk_window_set_has_resize_grip (GTK_WINDOW (_window), FALSE);
@@ -38,6 +43,21 @@
   gtk_window_set_skip_pager_hint (GTK_WINDOW (_window), TRUE);
   gtk_window_set_skip_taskbar_hint (GTK_WINDOW (_window), TRUE);
   gtk_window_resize (GTK_WINDOW (_window), 1, 24);
+ 
+  /*
+  GtkStyleContext* style_context = gtk_widget_get_style_context(_window);
+
+  GtkWidgetPath* widget_path = gtk_widget_path_new();
+  guint pos = gtk_widget_path_append_type(widget_path, GTK_TYPE_WINDOW);
+  gtk_widget_path_iter_set_name(widget_path, pos, "UnityPanelWidget");
+ 
+  gtk_style_context_set_path(style_context, widget_path);
+  gtk_style_context_add_class(style_context, "gnome-panel-menu-bar");
+  gtk_style_context_add_class(style_context, "unity-panel");
+ 
+  gtk_widget_path_free(widget_path);
+  */
+  
   SetMinMaxSize (1, 24);
   gtk_window_move (GTK_WINDOW (_window), 200, 12);
   gtk_widget_set_name (_window, "UnityPanelApplet");
@@ -53,6 +73,8 @@
                                     GTK_ORIENTATION_HORIZONTAL,
                                     (NaTrayFilterCallback)FilterTrayCallback,
                                     this);
+   /* na_tray_set_icon_size(_tray, 24); */
+
     _tray_icon_added_id = g_signal_connect (na_tray_get_manager (_tray), "tray_icon_removed",
                                             G_CALLBACK (PanelTray::OnTrayIconRemoved), this);
 
@@ -104,11 +126,11 @@
 {
   if (_tray)
   {
-    SetMinMaxSize ((_n_children * 24) + (PADDING * 2), 24);
+    SetMinMaxSize (WidthOfTray() + (PADDING * 2), 24);
     QueueRelayout ();
     QueueDraw ();
 
-    if (_n_children)
+    if (_children.size())
       gtk_widget_show (_window);
     else
       gtk_widget_hide (_window);
@@ -156,7 +178,7 @@
     if (na_tray_child_has_alpha (icon))
       na_tray_child_set_composited (icon, TRUE);
 
-    self->_n_children++;
+    self->_children.push_back(icon);
     g_idle_add ((GSourceFunc)IdleSync, self);
   }
 
@@ -176,18 +198,39 @@
 void
 PanelTray::OnTrayIconRemoved (NaTrayManager *manager, NaTrayChild *child, PanelTray *self)
 {
-  g_idle_add ((GSourceFunc)IdleSync, self);
-  if (self->_n_children > 0)
-    self->_n_children--;
+  for (std::vector<NaTrayChild*>::iterator it = self->_children.begin(); it != self->_children.end(); ++it)
+  {
+    if (*it == child)
+    {
+      g_idle_add ((GSourceFunc)IdleSync, self);
+      self->_children.erase(it);
+      break;
+    }
+  }
 }
 
 gboolean
 PanelTray::IdleSync (PanelTray *self)
 {
+  int width = self->WidthOfTray();
+  gtk_window_resize(GTK_WINDOW(self->_window), width, 24);
   self->Sync ();
   return FALSE;
 }
 
+int PanelTray::WidthOfTray()
+{
+  int width = 0;
+  for (std::vector<NaTrayChild*>::iterator it = this->_children.begin(); it != this->_children.end(); ++it)
+  {
+    GtkAllocation alloc;
+    gtk_widget_get_allocation(GTK_WIDGET(*it), &alloc);
+    int w = alloc.width;
+    width += w > 24 ? w : 24;
+  }
+  return width;
+}
+
 gboolean
 PanelTray::OnTrayExpose (GtkWidget *widget, GdkEventExpose *ev, PanelTray *tray)
 {

=== modified file 'src/PanelTray.h'
--- src/PanelTray.h	2011-06-16 12:12:02 +0000
+++ src/PanelTray.h	2011-09-05 19:31:25 +0000
@@ -35,7 +35,7 @@
 class PanelTray : public PanelIndicatorObjectView
 {
 public:
-
+  typedef std::vector<NaTrayChild*> TrayChildren;
   PanelTray ();
   ~PanelTray ();
 
@@ -50,7 +50,6 @@
   void OnEntryRemoved (IndicatorObjectEntryProxy *proxy);
 
 public:
-  guint8     _n_children;
   char     **_whitelist;
 protected:
   const gchar * GetName ();
@@ -63,10 +62,14 @@
   static gboolean IdleSync (PanelTray *tray);
   static gboolean OnTrayExpose (GtkWidget *widget, GdkEventExpose *ev, PanelTray *tray);
 
+  void RealInit();
+  int WidthOfTray();
+
 private:
   GSettings *_settings;
   GtkWidget *_window;
   NaTray    *_tray;
+  TrayChildren _children;
   int        _last_x;
   int        _last_y;