[Xfce4-commits] <xfce4-panel:master> Revert "Set and restore a unique role name for windows (bug #7094)."

[Nick Schermer]

Updating branch refs/heads/master
         to 9b2b3c1463f46d6fa8e555f9a558f957f5f266e0 (commit)
       from 1542be0dc85034ecf93f311851e6ace165705700 (commit)

commit 9b2b3c1463f46d6fa8e555f9a558f957f5f266e0
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Feb 13 14:14:22 2011 +0100

    Revert "Set and restore a unique role name for windows (bug #7094)."
    
    This reverts commit 4a3230b22f6cec2549b3ee2ee696b5d8a65ba155.
    
    Conflicts:
    
    	panel/panel-window.c

 panel/panel-application.c |   15 +--------------
 1 files changed, 1 insertions(+), 14 deletions(-)

diff --git a/panel/panel-application.c b/panel/panel-application.c
index 94aa4eb..fdf4a27 100644
--- a/panel/panel-application.c
+++ b/panel/panel-application.c
@@ -259,6 +259,7 @@ panel_application_xfconf_window_bindings (PanelApplication *application,
   const PanelProperty  properties[] =
   {
     { "position-locked", G_TYPE_BOOLEAN },
+    { "autohide", G_TYPE_BOOLEAN },
     { "span-monitors", G_TYPE_BOOLEAN },
     { "horizontal", G_TYPE_BOOLEAN },
     { "size", G_TYPE_UINT },
@@ -273,8 +274,6 @@ panel_application_xfconf_window_bindings (PanelApplication *application,
     { "output-name", G_TYPE_STRING },
     { "position", G_TYPE_STRING },
     { "disable-struts", G_TYPE_BOOLEAN },
-    { "role", G_TYPE_STRING }, /* GtkWindow property (see bug #7094) */
-    { "autohide", G_TYPE_BOOLEAN },
     { NULL }
   };
 
@@ -1273,8 +1272,6 @@ panel_application_new_window (PanelApplication *application,
   GtkWidget *itembar;
   gchar     *property;
   gint       idx;
-  GTimeVal   tv;
-  gchar     *wmrole;
 
   panel_return_val_if_fail (PANEL_IS_APPLICATION (application), NULL);
   panel_return_val_if_fail (screen == NULL || GDK_IS_SCREEN (screen), NULL);
@@ -1333,16 +1330,6 @@ panel_application_new_window (PanelApplication *application,
   if (new_window)
     g_object_notify (G_OBJECT (window), "position");
 
-  /* create a somewhat unique role for the panel window (bug #7094) */
-  if (gtk_window_get_role (GTK_WINDOW (window)) == NULL)
-    {
-      g_get_current_time (&tv);
-      idx = g_slist_index (application->windows, window);
-      wmrole = g_strdup_printf (PACKAGE_NAME "-%ld%d", tv.tv_sec, idx);
-      gtk_window_set_role (GTK_WINDOW (window), wmrole);
-      g_free (wmrole);
-    }
-
   return PANEL_WINDOW (window);
 }