diff options
author | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-07-23 10:18:37 +0800 |
---|---|---|
committer | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-07-23 10:18:37 +0800 |
commit | ed8c7c9aed6272c990b80f04892be6e6051c2bc8 (patch) | |
tree | 791576e7a889ff48e6410923be5a1f5995b537b7 /x11/gnome-panel/files | |
parent | 62aee17d1df015f8e81cb8280b8aa68eebcbafd0 (diff) | |
download | marcuscom-ports-ed8c7c9aed6272c990b80f04892be6e6051c2bc8.tar marcuscom-ports-ed8c7c9aed6272c990b80f04892be6e6051c2bc8.tar.gz marcuscom-ports-ed8c7c9aed6272c990b80f04892be6e6051c2bc8.tar.bz2 marcuscom-ports-ed8c7c9aed6272c990b80f04892be6e6051c2bc8.tar.lz marcuscom-ports-ed8c7c9aed6272c990b80f04892be6e6051c2bc8.tar.xz marcuscom-ports-ed8c7c9aed6272c990b80f04892be6e6051c2bc8.tar.zst marcuscom-ports-ed8c7c9aed6272c990b80f04892be6e6051c2bc8.zip |
USE_X_PREFIX -> USE_XLIB, bump the PORTREVISION.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6708 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11/gnome-panel/files')
-rw-r--r-- | x11/gnome-panel/files/patch-applets_clock_clock.c | 24 | ||||
-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/files/patch-config.h.in | 11 | ||||
-rw-r--r-- | x11/gnome-panel/files/patch-configure | 11 | ||||
-rw-r--r-- | x11/gnome-panel/files/patch-gnome-panel_menu.c | 42 | ||||
-rw-r--r-- | x11/gnome-panel/files/patch-po_ja.po | 20 | ||||
-rw-r--r-- | x11/gnome-panel/files/patch-po_ko.po | 38 |
8 files changed, 267 insertions, 0 deletions
diff --git a/x11/gnome-panel/files/patch-applets_clock_clock.c b/x11/gnome-panel/files/patch-applets_clock_clock.c new file mode 100644 index 000000000..981e4b4f2 --- /dev/null +++ b/x11/gnome-panel/files/patch-applets_clock_clock.c @@ -0,0 +1,24 @@ +--- applets/clock/clock.c.orig Mon Oct 24 02:25:11 2005 ++++ applets/clock/clock.c Tue Nov 22 02:47:05 2005 +@@ -47,7 +47,9 @@ + #include <dirent.h> + #include <string.h> + #include <time.h> ++#ifdef HAVE_LANGINFO_H + #include <langinfo.h> ++#endif + + #include <panel-applet.h> + #include <panel-applet-gconf.h> +@@ -545,7 +547,11 @@ clock_locale_format (void) + { + const char *am; + ++#ifdef HAVE_LANGINFO_H + am = nl_langinfo (AM_STR); ++#else ++ am = "AM"; ++#endif + return (am[0] == '\0') ? CLOCK_FORMAT_24 : CLOCK_FORMAT_12; + } + diff --git a/x11/gnome-panel/files/patch-applets_notification__area_eggtraymanager.c b/x11/gnome-panel/files/patch-applets_notification__area_eggtraymanager.c new file mode 100644 index 000000000..727a47b99 --- /dev/null +++ b/x11/gnome-panel/files/patch-applets_notification__area_eggtraymanager.c @@ -0,0 +1,48 @@ +--- 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 new file mode 100644 index 000000000..22802096c --- /dev/null +++ b/x11/gnome-panel/files/patch-applets_notification__area_main.c @@ -0,0 +1,73 @@ +--- 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/files/patch-config.h.in b/x11/gnome-panel/files/patch-config.h.in new file mode 100644 index 000000000..8a59166a5 --- /dev/null +++ b/x11/gnome-panel/files/patch-config.h.in @@ -0,0 +1,11 @@ +--- config.h.in.orig Thu Jan 2 19:50:41 2003 ++++ config.h.in Mon Jan 6 13:11:12 2003 +@@ -96,6 +96,8 @@ + /* Define to 1 if you have the <stdlib.h> header file. */ + #undef HAVE_STDLIB_H + ++#undef HAVE_LANGINFO_H ++ + /* Define to 1 if you have the <strings.h> header file. */ + #undef HAVE_STRINGS_H + diff --git a/x11/gnome-panel/files/patch-configure b/x11/gnome-panel/files/patch-configure new file mode 100644 index 000000000..732f3a860 --- /dev/null +++ b/x11/gnome-panel/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig Wed Jan 14 15:54:42 2004 ++++ configure Wed Jan 14 15:55:13 2004 +@@ -5536,7 +5536,7 @@ + + + for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ +- inttypes.h stdint.h unistd.h ++ inttypes.h stdint.h unistd.h langinfo.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + echo "$as_me:$LINENO: checking for $ac_header" >&5 diff --git a/x11/gnome-panel/files/patch-gnome-panel_menu.c b/x11/gnome-panel/files/patch-gnome-panel_menu.c new file mode 100644 index 000000000..aa7aeae8c --- /dev/null +++ b/x11/gnome-panel/files/patch-gnome-panel_menu.c @@ -0,0 +1,42 @@ +--- gnome-panel/menu.c.orig Sat Mar 26 15:12:10 2005 ++++ gnome-panel/menu.c Fri Jun 3 11:17:45 2005 +@@ -1535,8 +1535,8 @@ + return NULL; + } + +-static void +-image_menu_shown (GtkWidget *image, gpointer data) ++static gboolean ++image_menu_exposed (GtkWidget *image, GdkEventExpose *event, gpointer data) + { + IconToLoad *new_icon; + IconToLoad *icon; +@@ -1545,7 +1545,7 @@ + + /* if we've already handled this */ + if (gtk_image_get_storage_type (GTK_IMAGE (image)) != GTK_IMAGE_EMPTY) +- return; ++ return FALSE; /* propagate event */ + + if (find_in_load_list (image) == NULL) { + new_icon = icon_to_load_copy (icon); +@@ -1554,6 +1554,8 @@ + } + if (load_icons_id == 0) + load_icons_id = g_idle_add (load_icons_handler, NULL); ++ ++ return FALSE; /* propagate event */ + } + + static void +@@ -1601,8 +1603,8 @@ + gtk_image_menu_item_set_image ( + GTK_IMAGE_MENU_ITEM (image_menu_item), image); + +- g_signal_connect_data (image, "map", +- G_CALLBACK (image_menu_shown), icon, ++ g_signal_connect_data (image, "expose-event", ++ G_CALLBACK (image_menu_exposed), icon, + (GClosureNotify) icon_to_load_free, 0); + + g_signal_connect (image, "destroy", diff --git a/x11/gnome-panel/files/patch-po_ja.po b/x11/gnome-panel/files/patch-po_ja.po new file mode 100644 index 000000000..1d3343b41 --- /dev/null +++ b/x11/gnome-panel/files/patch-po_ja.po @@ -0,0 +1,20 @@ +--- po/ja.po.orig Mon Mar 7 23:15:19 2005 ++++ po/ja.po Fri Apr 8 14:12:28 2005 +@@ -105,7 +105,7 @@ + #. + #: ../applets/clock/clock.c:281 + msgid "%a %b %e" +-msgstr "%b%e日 (%a)" ++msgstr "%B%e日 (%a)" + + #. translators: reverse the order of these arguments + #. * if the time should come before the +@@ -138,7 +138,7 @@ + #. we will display the start date in the most abbreviated way possible. + #: ../applets/clock/clock.c:591 + msgid "%b %d" +-msgstr "%b%e日" ++msgstr "%B%e日" + + #: ../applets/clock/clock.c:890 + msgid "Tasks" diff --git a/x11/gnome-panel/files/patch-po_ko.po b/x11/gnome-panel/files/patch-po_ko.po new file mode 100644 index 000000000..7dbd45da7 --- /dev/null +++ b/x11/gnome-panel/files/patch-po_ko.po @@ -0,0 +1,38 @@ +--- po/ko.po.orig Wed Sep 21 02:37:42 2005 ++++ po/ko.po Fri Feb 3 15:58:18 2006 +@@ -98,7 +98,7 @@ + #. + #: ../applets/clock/clock.c:279 + msgid "%a %b %e" +-msgstr "%b %e일 (%a)" ++msgstr "%B %e일 (%a)" + + #. translators: reverse the order of these arguments + #. * if the time should come before the +@@ -125,7 +125,7 @@ + #. Show date in tooltip + #: ../applets/clock/clock.c:378 + msgid "%A %B %d" +-msgstr "%b %e일 %A" ++msgstr "%B %e일 %A" + + #: ../applets/clock/clock.c:390 + msgid "Click to view your appointments and tasks" +@@ -139,7 +139,7 @@ + #. we will display the start date in the most abbreviated way possible. + #: ../applets/clock/clock.c:598 + msgid "%b %d" +-msgstr "%b %e일" ++msgstr "%B %e일" + + #: ../applets/clock/clock.c:925 + msgid "Tasks" +@@ -171,7 +171,7 @@ + + #: ../applets/clock/clock.c:1767 + msgid "%A, %B %d %Y" +-msgstr "%Y년 %b %e일 %A" ++msgstr "%Y년 %B %e일 %A" + + #: ../applets/clock/clock.c:1824 + #, c-format |