author | Jon Tibble <meths@btinternet.com> |
Sat, 06 Oct 2012 16:11:50 +0100 | |
branch | s11express-2010-11 |
changeset 22109 | db10202d5f6d |
parent 16014 | 657275c2abd8 |
permissions | -rw-r--r-- |
16014
657275c2abd8
* SUNWgnome-panel.spec : Update %doc for 2.26.3 tarballs
mattman
parents:
9901
diff
changeset
|
1 |
/jds/bin/diff -uprN gnome-panel-2.26.3.old/gnome-panel/panel-menu-button.c gnome-panel-2.26.3/gnome-panel/panel-menu-button.c |
657275c2abd8
* SUNWgnome-panel.spec : Update %doc for 2.26.3 tarballs
mattman
parents:
9901
diff
changeset
|
2 |
--- gnome-panel-2.26.3.old/gnome-panel/panel-menu-button.c 2009-07-01 19:05:59.893447000 +0100 |
657275c2abd8
* SUNWgnome-panel.spec : Update %doc for 2.26.3 tarballs
mattman
parents:
9901
diff
changeset
|
3 |
+++ gnome-panel-2.26.3/gnome-panel/panel-menu-button.c 2009-07-01 19:12:26.734444000 +0100 |
657275c2abd8
* SUNWgnome-panel.spec : Update %doc for 2.26.3 tarballs
mattman
parents:
9901
diff
changeset
|
4 |
@@ -649,7 +649,7 @@ panel_menu_button_load (const char *men |
8382
5340d1f7700f
Remove gnome-panel-02-workspace-switcher.diff : #127285, applied upstream.
mattman
parents:
diff
changeset
|
5 |
"tooltip", tooltip, |
5340d1f7700f
Remove gnome-panel-02-workspace-switcher.diff : #127285, applied upstream.
mattman
parents:
diff
changeset
|
6 |
"use-menu-path", use_menu_path, |
5340d1f7700f
Remove gnome-panel-02-workspace-switcher.diff : #127285, applied upstream.
mattman
parents:
diff
changeset
|
7 |
"use-custom-icon", use_custom_icon, |
5340d1f7700f
Remove gnome-panel-02-workspace-switcher.diff : #127285, applied upstream.
mattman
parents:
diff
changeset
|
8 |
- "has-arrow", TRUE, |
5340d1f7700f
Remove gnome-panel-02-workspace-switcher.diff : #127285, applied upstream.
mattman
parents:
diff
changeset
|
9 |
+ "has-arrow", FALSE, |
5340d1f7700f
Remove gnome-panel-02-workspace-switcher.diff : #127285, applied upstream.
mattman
parents:
diff
changeset
|
10 |
NULL); |
5340d1f7700f
Remove gnome-panel-02-workspace-switcher.diff : #127285, applied upstream.
mattman
parents:
diff
changeset
|
11 |
|
5340d1f7700f
Remove gnome-panel-02-workspace-switcher.diff : #127285, applied upstream.
mattman
parents:
diff
changeset
|
12 |
info = panel_applet_register (GTK_WIDGET (button), NULL, NULL, |
16014
657275c2abd8
* SUNWgnome-panel.spec : Update %doc for 2.26.3 tarballs
mattman
parents:
9901
diff
changeset
|
13 |
@@ -715,8 +715,23 @@ panel_menu_button_get_icon (PanelMenuBut |
9147
3d91c998b3e1
* patches/gnome-panel-05-notificationarea-tooltip.diff : Rework for 2.17.90 tarball
mattman
parents:
8382
diff
changeset
|
14 |
retval = g_strdup (gmenu_tree_directory_get_icon (directory)); |
8382
5340d1f7700f
Remove gnome-panel-02-workspace-switcher.diff : #127285, applied upstream.
mattman
parents:
diff
changeset
|
15 |
} |
5340d1f7700f
Remove gnome-panel-02-workspace-switcher.diff : #127285, applied upstream.
mattman
parents:
diff
changeset
|
16 |
|
9147
3d91c998b3e1
* patches/gnome-panel-05-notificationarea-tooltip.diff : Rework for 2.17.90 tarball
mattman
parents:
8382
diff
changeset
|
17 |
- if (!retval) |
9901 | 18 |
- retval = g_strdup (PANEL_ICON_MAIN_MENU); |
9147
3d91c998b3e1
* patches/gnome-panel-05-notificationarea-tooltip.diff : Rework for 2.17.90 tarball
mattman
parents:
8382
diff
changeset
|
19 |
+ if (!retval) { |
3d91c998b3e1
* patches/gnome-panel-05-notificationarea-tooltip.diff : Rework for 2.17.90 tarball
mattman
parents:
8382
diff
changeset
|
20 |
+ static gboolean inited = FALSE; |
3d91c998b3e1
* patches/gnome-panel-05-notificationarea-tooltip.diff : Rework for 2.17.90 tarball
mattman
parents:
8382
diff
changeset
|
21 |
+ static gboolean has_sun_branding = FALSE; |
3d91c998b3e1
* patches/gnome-panel-05-notificationarea-tooltip.diff : Rework for 2.17.90 tarball
mattman
parents:
8382
diff
changeset
|
22 |
+ |
3d91c998b3e1
* patches/gnome-panel-05-notificationarea-tooltip.diff : Rework for 2.17.90 tarball
mattman
parents:
8382
diff
changeset
|
23 |
+ if (!inited) { |
3d91c998b3e1
* patches/gnome-panel-05-notificationarea-tooltip.diff : Rework for 2.17.90 tarball
mattman
parents:
8382
diff
changeset
|
24 |
+ GtkIconTheme *theme = gtk_icon_theme_get_default (); |
8382
5340d1f7700f
Remove gnome-panel-02-workspace-switcher.diff : #127285, applied upstream.
mattman
parents:
diff
changeset
|
25 |
+ |
9147
3d91c998b3e1
* patches/gnome-panel-05-notificationarea-tooltip.diff : Rework for 2.17.90 tarball
mattman
parents:
8382
diff
changeset
|
26 |
+ if (gtk_icon_theme_has_icon (theme, "sun-start-here")) |
3d91c998b3e1
* patches/gnome-panel-05-notificationarea-tooltip.diff : Rework for 2.17.90 tarball
mattman
parents:
8382
diff
changeset
|
27 |
+ has_sun_branding = TRUE; |
9901 | 28 |
+ inited = TRUE; |
29 |
+ } |
|
8382
5340d1f7700f
Remove gnome-panel-02-workspace-switcher.diff : #127285, applied upstream.
mattman
parents:
diff
changeset
|
30 |
+ |
9901 | 31 |
+ if (has_sun_branding) |
32 |
+ retval = g_strdup ("sun-start-here"); |
|
33 |
+ else |
|
34 |
+ retval = g_strdup (PANEL_ICON_MAIN_MENU); |
|
9147
3d91c998b3e1
* patches/gnome-panel-05-notificationarea-tooltip.diff : Rework for 2.17.90 tarball
mattman
parents:
8382
diff
changeset
|
35 |
+ } |
8382
5340d1f7700f
Remove gnome-panel-02-workspace-switcher.diff : #127285, applied upstream.
mattman
parents:
diff
changeset
|
36 |
|
5340d1f7700f
Remove gnome-panel-02-workspace-switcher.diff : #127285, applied upstream.
mattman
parents:
diff
changeset
|
37 |
return retval; |
5340d1f7700f
Remove gnome-panel-02-workspace-switcher.diff : #127285, applied upstream.
mattman
parents:
diff
changeset
|
38 |
} |