Merge lp:~larsu/unity/panel-service-menu-style-fix-again into lp:unity

[Lars Karlitski]

Don't attach the menus to an invisible menubar

Don't attach the menus to an invisible menubar

It doesn't seem to serve any purpose anymore. Also, it breaks highlighting on hover in gtk 3.8, because invisible widgets don't invalidate their style.

[Marco Trevisan (Treviño) (3v1n0)]

This was needed for styling, are you sure it is not needed anymore?
Please check this with Cimi as well.

[Lars Karlitski (larsu)]

Yes I'm sure, why else would I propose this merge?

I'd be happy if other people verified this, though. I'll add Cimi as a reviewer.

[Sebastien Bacher (seb128)]

ok, that's blocking the New GTK and nobody in the Unity team seems to have enough of an opinion to comment/approve it so I'm doint that, if anything it will do a small visible change that we can fix, it's still better than blocking GTK and other work to land

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'services/panel-service.c'
--- services/panel-service.c	2013-02-04 21:12:57 +0000
+++ services/panel-service.c	2013-03-01 23:09:19 +0000
@@ -1242,10 +1242,6 @@
   g_signal_handler_disconnect (priv->last_menu, priv->last_menu_id);
   g_signal_handler_disconnect (priv->last_menu, priv->last_menu_move_id);
 
-  GtkWidget *top_win = gtk_widget_get_toplevel (GTK_WIDGET (priv->last_menu));
-  if (GTK_IS_WINDOW (top_win))
-    gtk_window_set_attached_to (GTK_WINDOW (top_win), NULL);
-
   priv->last_menu = NULL;
   priv->last_menu_id = 0;
   priv->last_menu_move_id = 0;
@@ -1705,16 +1701,6 @@
                             G_CALLBACK (menuitem_activated), entry);
         }
 
-      GtkWidget *top_widget = gtk_widget_get_toplevel (GTK_WIDGET (priv->last_menu));
-
-      if (GTK_IS_WINDOW (top_widget))
-        {
-          GtkWindow *top_win = GTK_WINDOW (top_widget);
-
-          if (gtk_window_get_attached_to (top_win) != priv->menubar)
-            gtk_window_set_attached_to (top_win, priv->menubar);
-        }
-
       priv->last_entry = entry;
       priv->last_x = x;
       priv->last_y = y;