rpms/gnome-panel/devel panel-icons.patch, NONE, 1.1 gnome-panel.spec, 1.358, 1.359
Matthias Clasen
mclasen at fedoraproject.org
Wed Jul 22 21:32:55 UTC 2009
Author: mclasen
Update of /cvs/pkgs/rpms/gnome-panel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16440
Modified Files:
gnome-panel.spec
Added Files:
panel-icons.patch
Log Message:
Make category icons obey the menu-images setting
panel-icons.patch:
menu.c | 2 +-
panel-menu-items.c | 38 +++++++++++++++++++++++++-------------
panel-recent.c | 2 +-
3 files changed, 27 insertions(+), 15 deletions(-)
--- NEW FILE panel-icons.patch ---
diff -up gnome-panel-2.27.4/gnome-panel/menu.c.panel-icons gnome-panel-2.27.4/gnome-panel/menu.c
--- gnome-panel-2.27.4/gnome-panel/menu.c.panel-icons 2009-07-01 09:06:23.000000000 -0400
+++ gnome-panel-2.27.4/gnome-panel/menu.c 2009-07-22 16:36:34.928388257 -0400
@@ -1389,7 +1389,7 @@ create_submenu_entry (GtkWidget
{
GtkWidget *menuitem;
- menuitem = panel_image_menu_item_new ();
+ menuitem = gtk_image_menu_item_new ();
panel_load_menu_image_deferred (menuitem,
panel_menu_icon_get_size (),
NULL, NULL,
diff -up gnome-panel-2.27.4/gnome-panel/panel-menu-items.c.panel-icons gnome-panel-2.27.4/gnome-panel/panel-menu-items.c
--- gnome-panel-2.27.4/gnome-panel/panel-menu-items.c.panel-icons 2009-07-22 16:36:34.768127904 -0400
+++ gnome-panel-2.27.4/gnome-panel/panel-menu-items.c 2009-07-22 16:39:57.329131999 -0400
@@ -1,4 +1,5 @@
-/*
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
* Copyright (C) 2005 Vincent Untz
*
* This program is free software; you can redistribute it and/or
@@ -141,7 +142,8 @@ activate_desktop_uri (GtkWidget *menuite
static void
panel_menu_items_append_from_desktop (GtkWidget *menu,
char *path,
- char *force_name)
+ char *force_name,
+ gboolean use_icon)
{
GKeyFile *key_file;
gboolean loaded;
@@ -237,7 +239,12 @@ panel_menu_items_append_from_desktop (Gt
else
name = g_strdup (force_name);
- item = panel_image_menu_item_new ();
+ if (use_icon) {
+ item = panel_image_menu_item_new ();
+ } else {
+ item = gtk_image_menu_item_new ();
+ }
+
setup_menu_item_with_icon (item, panel_menu_icon_get_size (),
icon, NULL, NULL, name);
@@ -313,7 +320,7 @@ panel_menu_items_create_action_item_full
if (panel_action_get_is_disabled (action_type))
return NULL;
- item = panel_image_menu_item_new ();
+ item = gtk_image_menu_item_new ();
setup_menu_item_with_icon (item,
panel_menu_icon_get_size (),
panel_action_get_icon_name (action_type),
@@ -1032,7 +1039,8 @@ panel_place_menu_item_create_menu (Panel
NULL);
panel_menu_items_append_from_desktop (places_menu,
"gnome-nautilus-computer.desktop",
- gconf_name);
+ gconf_name,
+ TRUE);
if (gconf_name)
g_free (gconf_name);
@@ -1041,7 +1049,8 @@ panel_place_menu_item_create_menu (Panel
panel_menu_items_append_from_desktop (places_menu,
"gnome-network-scheme.desktop",
- NULL);
+ NULL,
+ TRUE);
panel_place_menu_item_append_remote_gio (place_item, places_menu);
if (panel_is_program_in_path ("nautilus-connect-server")) {
@@ -1056,15 +1065,18 @@ panel_place_menu_item_create_menu (Panel
if (panel_has_desktop_file ("gnome-beagle-search.desktop")) {
panel_menu_items_append_from_desktop (places_menu,
"gnome-beagle-search.desktop",
- NULL);
+ NULL,
+ FALSE);
} else if (panel_has_desktop_file ("fedora-tracker-search-tool.desktop")) {
panel_menu_items_append_from_desktop (places_menu,
"fedora-tracker-search-tool.desktop",
- NULL);
+ NULL,
+ FALSE);
} else {
panel_menu_items_append_from_desktop (places_menu,
"gnome-search-tool.desktop",
- NULL);
+ NULL,
+ FALSE);
}
@@ -1158,11 +1170,11 @@ panel_desktop_menu_item_append_menu (Gtk
if (add_separator)
add_menu_separator (menu);
- panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL);
- panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL);
- panel_menu_items_append_from_desktop (menu, "about-fedora.desktop", NULL);
+ panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL, FALSE);
+ panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL, FALSE);
+ panel_menu_items_append_from_desktop (menu, "about-fedora.desktop", NULL, FALSE);
if (panel_has_desktop_file ("about-this-computer.desktop"))
- panel_menu_items_append_from_desktop (menu, "about-this-computer.desktop", NULL);
+ panel_menu_items_append_from_desktop (menu, "about-this-computer.desktop", NULL, FALSE);
if (parent->priv->append_lock_logout)
panel_menu_items_append_lock_logout (menu);
diff -up gnome-panel-2.27.4/gnome-panel/panel-recent.c.panel-icons gnome-panel-2.27.4/gnome-panel/panel-recent.c
--- gnome-panel-2.27.4/gnome-panel/panel-recent.c.panel-icons 2009-07-01 09:06:23.000000000 -0400
+++ gnome-panel-2.27.4/gnome-panel/panel-recent.c 2009-07-22 16:36:34.933388684 -0400
@@ -188,7 +188,7 @@ panel_recent_append_documents_menu (GtkW
GtkWidget *menu_item;
int size;
- menu_item = panel_image_menu_item_new ();
+ menu_item = gtk_image_menu_item_new ();
setup_menu_item_with_icon (menu_item,
panel_menu_icon_get_size (),
PANEL_ICON_RECENT,
Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -p -r1.358 -r1.359
--- gnome-panel.spec 15 Jul 2009 20:32:07 -0000 1.358
+++ gnome-panel.spec 22 Jul 2009 21:32:55 -0000 1.359
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.27.4
-Release: 1%{?dist}
+Release: 2%{?dist}
URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/gnome-panel/2.27/%{name}-%{version}.tar.bz2
@@ -119,6 +119,9 @@ Patch38: clock-network.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=498366
Patch42: polkit1.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=322932
+Patch45: panel-icons.patch
+
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -167,6 +170,7 @@ Panel Applets using the libpanel-applet
%patch35 -p1 -b .clock-wakeups
%patch38 -p1 -b .clock-network
%patch42 -p1 -b .polkit1
+%patch45 -p1 -b .panel-icons
. %{SOURCE6}
@@ -363,6 +367,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Wed Jul 22 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.4-2
+- Make category icons follow the menu-images setting
+
* Wed Jul 15 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.4-1
- Update to 2.27.4
More information about the fedora-extras-commits
mailing list