diff options
-rw-r--r-- | x11/gnome-panel/Makefile | 4 | ||||
-rw-r--r-- | x11/gnome-panel/distinfo | 6 | ||||
-rw-r--r-- | x11/gnome-panel/files/patch-applets_notification__area_eggtraymanager.c | 48 | ||||
-rw-r--r-- | x11/gnome-panel/files/patch-applets_notification__area_main.c | 73 | ||||
-rw-r--r-- | x11/gnome-panel/pkg-plist | 46 |
5 files changed, 46 insertions, 131 deletions
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index 76b0690b1..455ee6897 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-panel/Makefile,v 1.130 2006/07/23 02:18:37 mezz Exp $ +# $MCom: ports/x11/gnome-panel/Makefile,v 1.131 2006/07/24 22:49:35 ahze Exp $ # PORTNAME= gnome-panel -PORTVERSION= 2.15.90 +PORTVERSION= 2.15.91 PORTREVISION?= 0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo index 62982fb86..0ab31d4da 100644 --- a/x11/gnome-panel/distinfo +++ b/x11/gnome-panel/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-panel-2.15.90.tar.bz2) = e3e7d3924fdfea18131b26fd3b321cbd -SHA256 (gnome2/gnome-panel-2.15.90.tar.bz2) = 1b79935121d1521cd621a6fecb0838d7985b91d1a59a383c16a5be8a5ebf94dd -SIZE (gnome2/gnome-panel-2.15.90.tar.bz2) = 2576598 +MD5 (gnome2/gnome-panel-2.15.91.tar.bz2) = c65487c43ed633ceb026f9b98115114d +SHA256 (gnome2/gnome-panel-2.15.91.tar.bz2) = f61c51bacb09666f26b9009475b19b85ae8aa0c07849a6d502dc940423d92ead +SIZE (gnome2/gnome-panel-2.15.91.tar.bz2) = 2671814 diff --git a/x11/gnome-panel/files/patch-applets_notification__area_eggtraymanager.c b/x11/gnome-panel/files/patch-applets_notification__area_eggtraymanager.c deleted file mode 100644 index 727a47b99..000000000 --- a/x11/gnome-panel/files/patch-applets_notification__area_eggtraymanager.c +++ /dev/null @@ -1,48 +0,0 @@ ---- applets/notification_area/eggtraymanager.c.orig Sat Dec 31 14:39:09 2005 -+++ applets/notification_area/eggtraymanager.c Mon May 15 01:36:18 2006 -@@ -291,6 +291,36 @@ - return FALSE; - } - -+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_manager_handle_dock_request (EggTrayManager *manager, - XClientMessageEvent *xevent) -@@ -306,6 +336,8 @@ - } - - socket = gtk_socket_new (); -+ g_signal_connect (socket, "realize", -+ G_CALLBACK (make_transparent), NULL); - - /* We need to set the child window here - * so that the client can call _get functions diff --git a/x11/gnome-panel/files/patch-applets_notification__area_main.c b/x11/gnome-panel/files/patch-applets_notification__area_main.c deleted file mode 100644 index 22802096c..000000000 --- a/x11/gnome-panel/files/patch-applets_notification__area_main.c +++ /dev/null @@ -1,73 +0,0 @@ ---- applets/notification_area/main.c.orig Wed Dec 28 22:15:27 2005 -+++ applets/notification_area/main.c Mon May 15 01:36:01 2006 -@@ -159,14 +159,24 @@ - tray = all_trays->data; - - gtk_box_pack_end (GTK_BOX (tray->box), icon, FALSE, FALSE, 0); -- -+ -+ gtk_widget_hide (tray->box); - gtk_widget_show (icon); -+ gtk_widget_show (tray->box); - } - - static void - tray_removed (EggTrayManager *manager, GtkWidget *icon, void *data) - { -+ SystemTray *tray; -+ -+ if (all_trays == NULL) -+ return; -+ -+ tray = all_trays->data; - -+ gtk_widget_hide (tray->box); -+ gtk_widget_show (tray->box); - } - - static void -@@ -207,9 +217,32 @@ - gtk_widget_set_size_request (tray->box, -1, MIN_BOX_SIZE); - break; - } -+ -+ /* Force the icons to redraw their backgrounds. -+ * gtk_widget_queue_draw() doesn't work across process boundaries, -+ * so we do this instead. -+ */ -+ gtk_widget_hide (tray->box); -+ gtk_widget_show (tray->box); - } - - static void -+applet_change_background (PanelApplet *applet, -+ PanelAppletBackgroundType type, -+ GdkColor *color, -+ GdkPixmap *pixmap, -+ SystemTray *tray) -+{ -+ /* Force the icons to redraw their backgrounds. -+ * gtk_widget_queue_draw() doesn't work across process boundaries, -+ * so we do this instead. -+ */ -+ gtk_widget_hide (tray->box); -+ gtk_widget_show (tray->box); -+} -+ -+ -+static void - applet_change_orientation (PanelApplet *applet, - PanelAppletOrient orient, - SystemTray *tray) -@@ -332,6 +365,11 @@ - g_signal_connect (G_OBJECT (tray->applet), - "change_orient", - G_CALLBACK (applet_change_orientation), -+ tray); -+ -+ g_signal_connect (G_OBJECT (tray->applet), -+ "change_background", -+ G_CALLBACK (applet_change_background), - tray); - - g_signal_connect (tray->applet, diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist index 756d58483..7e013fbc8 100644 --- a/x11/gnome-panel/pkg-plist +++ b/x11/gnome-panel/pkg-plist @@ -271,11 +271,47 @@ share/gnome/panel/pixmaps/gnome-gegl2-2.png share/gnome/panel/pixmaps/gnome-gegl2.png share/gnome/panel/pixmaps/monkey.png share/gnome/panel/pixmaps/oldwanda.png -share/icons/hicolor/48x48/apps/gnome-fish.png -share/icons/hicolor/48x48/apps/gnome-gegl.png -share/icons/hicolor/48x48/apps/gnome-main-menu.png -share/icons/hicolor/48x48/apps/panel-force-quit.png -share/icons/hicolor/48x48/apps/panel-separator.png +share/gnome/panel/pixmaps/wanda.png +share/icons/hicolor/16x16/apps/gnome-panel-clock.png +share/icons/hicolor/16x16/apps/gnome-panel-drawer.png +share/icons/hicolor/16x16/apps/gnome-panel-fish.png +share/icons/hicolor/16x16/apps/gnome-panel-force-quit.png +share/icons/hicolor/16x16/apps/gnome-panel-notification-area.png +share/icons/hicolor/16x16/apps/gnome-panel-separator.png +share/icons/hicolor/16x16/apps/gnome-panel-window-list.png +share/icons/hicolor/16x16/apps/gnome-panel-window-menu.png +share/icons/hicolor/16x16/apps/gnome-panel-workspace-switcher.png +share/icons/hicolor/16x16/apps/gnome-panel.png +share/icons/hicolor/22x22/apps/gnome-panel-clock.png +share/icons/hicolor/22x22/apps/gnome-panel-drawer.png +share/icons/hicolor/22x22/apps/gnome-panel-fish.png +share/icons/hicolor/22x22/apps/gnome-panel-force-quit.png +share/icons/hicolor/22x22/apps/gnome-panel-notification-area.png +share/icons/hicolor/22x22/apps/gnome-panel-separator.png +share/icons/hicolor/22x22/apps/gnome-panel-window-list.png +share/icons/hicolor/22x22/apps/gnome-panel-window-menu.png +share/icons/hicolor/22x22/apps/gnome-panel-workspace-switcher.png +share/icons/hicolor/22x22/apps/gnome-panel.png +share/icons/hicolor/32x32/apps/gnome-panel-clock.png +share/icons/hicolor/32x32/apps/gnome-panel-drawer.png +share/icons/hicolor/32x32/apps/gnome-panel-fish.png +share/icons/hicolor/32x32/apps/gnome-panel-force-quit.png +share/icons/hicolor/32x32/apps/gnome-panel-notification-area.png +share/icons/hicolor/32x32/apps/gnome-panel-separator.png +share/icons/hicolor/32x32/apps/gnome-panel-window-list.png +share/icons/hicolor/32x32/apps/gnome-panel-window-menu.png +share/icons/hicolor/32x32/apps/gnome-panel-workspace-switcher.png +share/icons/hicolor/32x32/apps/gnome-panel.png +share/icons/hicolor/scalable/apps/gnome-panel-clock.svg +share/icons/hicolor/scalable/apps/gnome-panel-drawer.svg +share/icons/hicolor/scalable/apps/gnome-panel-fish.svg +share/icons/hicolor/scalable/apps/gnome-panel-force-quit.svg +share/icons/hicolor/scalable/apps/gnome-panel-notification-area.svg +share/icons/hicolor/scalable/apps/gnome-panel-separator.svg +share/icons/hicolor/scalable/apps/gnome-panel-window-list.svg +share/icons/hicolor/scalable/apps/gnome-panel-window-menu.svg +share/icons/hicolor/scalable/apps/gnome-panel-workspace-switcher.svg +share/icons/hicolor/scalable/apps/gnome-panel.svg share/locale/af/LC_MESSAGES/gnome-panel-2.0.mo share/locale/am/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ar/LC_MESSAGES/gnome-panel-2.0.mo |