Attachment 135764 Details for Bug 205584 – patch with whitespace noise removed

[patch] patch with whitespace noise removed

eggtrayicon.c.patch (text/plain), 3.45 KB, created by Bill Nottingham on 2006-09-07 13:56:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bill Nottingham

Created: 2006-09-07 13:56:51 UTC

Size: 3.45 KB

patch

obsolete

>===================================================================
>RCS file: /cvs/gnome/rhythmbox/widgets/eggtrayicon.c,v
>retrieving revision 1.15
>retrieving revision 1.17
>diff -u -r1.15 -r1.17
>--- rhythmbox/widgets/eggtrayicon.c	2006/05/19 08:43:54	1.15
>+++ rhythmbox/widgets/eggtrayicon.c	2006/07/24 13:28:41	1.17
>@@ -85,6 +85,9 @@
> static void egg_tray_icon_realize   (GtkWidget *widget);
> static void egg_tray_icon_unrealize (GtkWidget *widget);
> 
>+static void egg_tray_icon_add (GtkContainer *container,
>+			       GtkWidget    *widget);
>+
> #ifdef GDK_WINDOWING_X11
> static void egg_tray_icon_update_manager_window    (EggTrayIcon *icon,
> 						    gboolean     dock_if_realized);
>@@ -133,6 +136,7 @@
> {
>   GObjectClass *gobject_class = (GObjectClass *)klass;
>   GtkWidgetClass *widget_class = (GtkWidgetClass *)klass;
>+  GtkContainerClass *container_class = (GtkContainerClass *)klass;
> 
>   parent_class = g_type_class_peek_parent (klass);
> 
>@@ -141,6 +145,8 @@
>   widget_class->realize   = egg_tray_icon_realize;
>   widget_class->unrealize = egg_tray_icon_unrealize;
> 
>+  container_class->add = egg_tray_icon_add;
>+
>   g_object_class_install_property (gobject_class,
> 				   PROP_ORIENTATION,
> 				   g_param_spec_enum ("orientation",
>@@ -381,16 +387,46 @@
>     }
> }
> 
>+static gboolean
>+transparent_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data)
>+{
>+  gdk_window_clear_area (widget->window, event->area.x, event->area.y,
>+			 event->area.width, event->area.height);
>+  return FALSE;
>+}
>+
>+static void
>+make_transparent_again (GtkWidget *widget, GtkStyle *previous_style,
>+			gpointer user_data)
>+{
>+  gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
>+}
>+
>+static void
>+make_transparent (GtkWidget *widget, gpointer user_data)
>+{
>+  if (GTK_WIDGET_NO_WINDOW (widget) || GTK_WIDGET_APP_PAINTABLE (widget))
>+    return;
>+
>+  gtk_widget_set_app_paintable (widget, TRUE);
>+  gtk_widget_set_double_buffered (widget, FALSE);
>+  gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
>+  g_signal_connect (widget, "expose_event",
>+		    G_CALLBACK (transparent_expose_event), NULL);
>+  g_signal_connect_after (widget, "style_set",
>+			  G_CALLBACK (make_transparent_again), NULL);
>+}	
>+
> static void
> egg_tray_icon_manager_window_destroyed (EggTrayIcon *icon)
> {
>   GdkWindow *gdkwin;
>-  
>+
>   g_return_if_fail (icon->manager_window != None);
> 
>   gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
> 					  icon->manager_window);
>-      
>+
>   gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon);
> 
>   icon->manager_window = None;
>@@ -425,6 +461,8 @@
>   if (GTK_WIDGET_CLASS (parent_class)->realize)
>     GTK_WIDGET_CLASS (parent_class)->realize (widget);
> 
>+  make_transparent (widget, NULL);
>+
>   screen = gtk_widget_get_screen (widget);
>   display = gdk_screen_get_display (screen);
>   xdisplay = gdk_x11_display_get_xdisplay (display);
>@@ -450,13 +488,21 @@
>   egg_tray_icon_send_dock_request (icon);
> 
>   root_window = gdk_screen_get_root_window (screen);
>-  
>+
>   /* Add a root window filter so that we get changes on MANAGER */
>   gdk_window_add_filter (root_window,
> 			 egg_tray_icon_manager_filter, icon);
> #endif
> }
> 
>+static void
>+egg_tray_icon_add (GtkContainer *container, GtkWidget *widget)
>+{
>+  g_signal_connect (widget, "realize",
>+		    G_CALLBACK (make_transparent), NULL);
>+  GTK_CONTAINER_CLASS (parent_class)->add (container, widget);
>+}
>+
> EggTrayIcon *
> egg_tray_icon_new_for_screen (GdkScreen *screen, const char *name)
> {

Actions: View | Diff

Attachments on bug 205584: 135760 | 135764