[gnome-panel/f14/master] re-add some patches
Matthias Clasen
mclasen at fedoraproject.org
Fri Sep 10 17:25:30 UTC 2010
commit 407f185d78a2652c6f916b2dd8b904824f6afd98
Author: Matthias Clasen <mclasen at redhat.com>
Date: Fri Sep 10 13:21:01 2010 -0400
re-add some patches
applet-error.patch | 50 ++++++++++++++++-------------
gnome-panel.spec | 6 ++--
icon-padding.patch | 89 ++++++++++++++++++++++++---------------------------
3 files changed, 72 insertions(+), 73 deletions(-)
---
diff --git a/applet-error.patch b/applet-error.patch
index 9a3228a..feb59fe 100644
--- a/applet-error.patch
+++ b/applet-error.patch
@@ -1,36 +1,40 @@
-diff -up gnome-panel-2.25.5/gnome-panel/panel-applet-frame.c.applet-error gnome-panel-2.25.5/gnome-panel/panel-applet-frame.c
---- gnome-panel-2.25.5/gnome-panel/panel-applet-frame.c.applet-error 2009-01-20 09:04:47.000000000 -0500
-+++ gnome-panel-2.25.5/gnome-panel/panel-applet-frame.c 2009-01-20 14:22:33.000000000 -0500
-@@ -1246,6 +1246,21 @@ panel_applet_frame_event_listener (Bonob
- panel_applet_frame_set_size_hints_from_any (frame, any);
+diff -up gnome-panel-2.31.90/gnome-panel/panel-applet-frame.c.applet-error gnome-panel-2.31.90/gnome-panel/panel-applet-frame.c
+--- gnome-panel-2.31.90/gnome-panel/panel-applet-frame.c.applet-error 2010-06-22 19:00:28.000000000 -0400
++++ gnome-panel-2.31.90/gnome-panel/panel-applet-frame.c 2010-09-10 13:17:37.507233002 -0400
+@@ -513,6 +513,21 @@ _panel_applet_frame_set_iid (PanelApplet
+ frame->priv->iid = g_strdup (iid);
}
+static gboolean
+in_default_panel_config (const gchar *id)
+{
-+ gchar *dir;
-+ gboolean result;
++ gchar *dir;
++ gboolean result;
+
-+ dir = g_strconcat (PANEL_DEFAULTS_DIR, "/applets/", id, NULL);
-+ result = gconf_client_dir_exists (panel_gconf_get_client (),
++ dir = g_strconcat (PANEL_DEFAULTS_DIR, "/applets/", id, NULL);
++ result = gconf_client_dir_exists (panel_gconf_get_client (),
+ dir,
+ NULL);
+ g_free (dir);
+
-+ return result;
++ return result;
+}
+
- static void
- panel_applet_frame_activated (CORBA_Object object,
- const char *error_reason,
-@@ -1425,7 +1440,9 @@ panel_applet_frame_activated (CORBA_Obje
- return;
+ void
+ _panel_applet_frame_activated (PanelAppletFrame *frame,
+ PanelAppletFrameActivating *frame_act,
+@@ -527,9 +542,11 @@ _panel_applet_frame_activated (PanelAppl
+ frame->priv->iid, error->message);
+ g_error_free (error);
+
+- panel_applet_frame_loading_failed (frame->priv->iid,
+- frame_act->panel,
+- frame_act->id);
++ if (!in_default_panel_config (frame_act->id)) {
++ panel_applet_frame_loading_failed (frame->priv->iid,
++ frame_act->panel,
++ frame_act->id);
++ }
+ panel_applet_frame_activating_free (frame_act);
+ gtk_widget_destroy (GTK_WIDGET (frame));
- error_out:
-- panel_applet_frame_loading_failed (frame, frame_act->id);
-+ if (!in_default_panel_config (frame_act->id)) {
-+ panel_applet_frame_loading_failed (frame, frame_act->id);
-+ }
- if (widget)
- g_object_unref (widget);
- panel_applet_stop_loading (frame_act->id);
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 27e943b..ade4e48 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -103,7 +103,7 @@ Patch10: preferred-apps.patch
# don't pop up an error dialog if an applet from the
# default configuration is missing; we don't want to
# add a hard dependency on e.g. tomboy
-#Patch11: applet-error.patch
+Patch11: applet-error.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=520111
Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
@@ -163,13 +163,13 @@ Panel Applets using the libpanel-applet library.
%patch8 -p1 -b .launcher-desktop-files
%patch9 -p1 -b .desktop-file-monitoring
%patch10 -p1 -b .preferred-apps
-#%patch11 -p1 -b .applet-error
+%patch11 -p1 -b .applet-error
%patch24 -p1 -b .allow-spurious-view-done-signals
%patch38 -p1 -b .clock-network
%patch40 -p1 -b .clock-home
%patch41 -p1 -b .bookmarks-submenu
%patch43 -p1 -b .panel-padding
-#%patch45 -p1 -b .icon-padding
+%patch45 -p1 -b .icon-padding
%patch47 -p1 -b .fix-clock-crash
%patch48 -p1 -b .libs
diff --git a/icon-padding.patch b/icon-padding.patch
index 5ccf4c0..53c2f60 100644
--- a/icon-padding.patch
+++ b/icon-padding.patch
@@ -1,6 +1,6 @@
-diff -u -r gnome-panel-2.28.0/applets/notification_area/main.c hacked/applets/notification_area/main.c
---- gnome-panel-2.28.0/applets/notification_area/main.c 2009-07-01 09:06:23.000000000 -0400
-+++ hacked/applets/notification_area/main.c 2009-10-17 23:06:01.001313433 -0400
+diff -up gnome-panel-2.31.90/applets/notification_area/main.c.icon-padding gnome-panel-2.31.90/applets/notification_area/main.c
+--- gnome-panel-2.31.90/applets/notification_area/main.c.icon-padding 2010-06-22 19:00:27.000000000 -0400
++++ gnome-panel-2.31.90/applets/notification_area/main.c 2010-09-10 13:10:30.425233001 -0400
@@ -25,6 +25,7 @@
#include <panel-applet.h>
@@ -17,7 +17,7 @@ diff -u -r gnome-panel-2.28.0/applets/notification_area/main.c hacked/applets/no
typedef struct
{
-@@ -231,6 +233,39 @@
+@@ -285,6 +287,39 @@ force_no_focus_padding (GtkWidget *widge
gtk_widget_set_name (widget, "na-tray");
}
@@ -57,7 +57,7 @@ diff -u -r gnome-panel-2.28.0/applets/notification_area/main.c hacked/applets/no
static gboolean
applet_factory (PanelApplet *applet,
const gchar *iid,
-@@ -260,9 +295,10 @@
+@@ -305,9 +340,12 @@ applet_factory (PanelApplet *applet,
atko = gtk_widget_get_accessible (GTK_WIDGET (applet));
atk_object_set_name (atko, _("Panel Notification Area"));
@@ -66,24 +66,17 @@ diff -u -r gnome-panel-2.28.0/applets/notification_area/main.c hacked/applets/no
PANEL_APPLET_HAS_HANDLE|PANEL_APPLET_EXPAND_MINOR);
-
+
- g_signal_connect (applet, "change_orient",
- G_CALLBACK (applet_change_orientation), data);
- g_signal_connect (applet, "change_background",
-@@ -270,6 +306,8 @@
- g_signal_connect (applet, "destroy",
- G_CALLBACK (applet_destroy), data);
-
+ setup_gconf (data);
+
panel_applet_set_background_widget (applet, GTK_WIDGET (applet));
- gtk_container_add (GTK_CONTAINER (applet), GTK_WIDGET (tray));
-diff -u -r gnome-panel-2.28.0/applets/notification_area/Makefile.am hacked/applets/notification_area/Makefile.am
---- gnome-panel-2.28.0/applets/notification_area/Makefile.am 2009-07-21 13:25:43.000000000 -0400
-+++ hacked/applets/notification_area/Makefile.am 2009-10-17 23:16:42.401072682 -0400
-@@ -66,6 +66,24 @@
-
- @INTLTOOL_SERVER_RULE@
+ force_no_focus_padding (GTK_WIDGET (applet));
+diff -up gnome-panel-2.31.90/applets/notification_area/Makefile.am.icon-padding gnome-panel-2.31.90/applets/notification_area/Makefile.am
+--- gnome-panel-2.31.90/applets/notification_area/Makefile.am.icon-padding 2010-06-22 19:00:27.000000000 -0400
++++ gnome-panel-2.31.90/applets/notification_area/Makefile.am 2010-09-10 13:11:52.523233000 -0400
+@@ -78,6 +78,24 @@ org.gnome.panel.applet.NotificationAreaA
+ $< > $@
+ endif
+schemasdir = $(GCONF_SCHEMA_FILE_DIR)
+schemas_in_files = notification_area_applet.schemas.in
@@ -95,7 +88,7 @@ diff -u -r gnome-panel-2.28.0/applets/notification_area/Makefile.am hacked/apple
+# don't do this if we are building in eg. rpm
+install-data-local:
+ if test -z "$(DESTDIR)" ; then \
-+ for p in $(schemas_DATA) ; do \
++ p in $(schemas_DATA) ; do \
+ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/applets/notification_area/$$p ; \
+ done \
+ fi
@@ -103,13 +96,13 @@ diff -u -r gnome-panel-2.28.0/applets/notification_area/Makefile.am hacked/apple
+install-data-local:
+endif
+
- uidir = $(datadir)/gnome-2.0/ui
- ui_DATA = GNOME_NotificationAreaApplet.xml
+ uidir = $(datadir)/gnome-panel/ui
+ ui_DATA = notification-area-menu.xml
-diff -u -r gnome-panel-2.28.0/applets/notification_area/na-tray.c hacked/applets/notification_area/na-tray.c
---- gnome-panel-2.28.0/applets/notification_area/na-tray.c 2009-10-17 23:22:01.095308064 -0400
-+++ hacked/applets/notification_area/na-tray.c 2009-10-17 23:00:01.304062848 -0400
-@@ -602,6 +602,8 @@
+diff -up gnome-panel-2.31.90/applets/notification_area/na-tray.c.icon-padding gnome-panel-2.31.90/applets/notification_area/na-tray.c
+--- gnome-panel-2.31.90/applets/notification_area/na-tray.c.icon-padding 2010-06-22 19:00:27.000000000 -0400
++++ gnome-panel-2.31.90/applets/notification_area/na-tray.c 2010-09-10 13:07:31.917233001 -0400
+@@ -624,6 +624,8 @@ na_tray_constructor (GType type,
{
trays_screens [screen_number].tray_manager = tray_manager;
@@ -118,7 +111,7 @@ diff -u -r gnome-panel-2.28.0/applets/notification_area/na-tray.c hacked/applets
g_signal_connect (tray_manager, "tray_icon_added",
G_CALLBACK (tray_added),
&trays_screens [screen_number]);
-@@ -804,6 +806,16 @@
+@@ -826,6 +828,16 @@ idle_redraw_cb (NaTray *tray)
}
void
@@ -135,10 +128,10 @@ diff -u -r gnome-panel-2.28.0/applets/notification_area/na-tray.c hacked/applets
na_tray_force_redraw (NaTray *tray)
{
NaTrayPrivate *priv = tray->priv;
-diff -u -r gnome-panel-2.28.0/applets/notification_area/na-tray.h hacked/applets/notification_area/na-tray.h
---- gnome-panel-2.28.0/applets/notification_area/na-tray.h 2009-04-19 13:45:09.000000000 -0400
-+++ hacked/applets/notification_area/na-tray.h 2009-10-17 23:00:30.491375187 -0400
-@@ -60,6 +60,8 @@
+diff -up gnome-panel-2.31.90/applets/notification_area/na-tray.h.icon-padding gnome-panel-2.31.90/applets/notification_area/na-tray.h
+--- gnome-panel-2.31.90/applets/notification_area/na-tray.h.icon-padding 2010-02-09 07:32:08.000000000 -0500
++++ gnome-panel-2.31.90/applets/notification_area/na-tray.h 2010-09-10 13:07:31.919233001 -0400
+@@ -60,6 +60,8 @@ NaTray *na_tray_new_for_screen
void na_tray_set_orientation (NaTray *tray,
GtkOrientation orientation);
GtkOrientation na_tray_get_orientation (NaTray *tray);
@@ -147,10 +140,10 @@ diff -u -r gnome-panel-2.28.0/applets/notification_area/na-tray.h hacked/applets
void na_tray_force_redraw (NaTray *tray);
G_END_DECLS
-diff -u -r gnome-panel-2.28.0/applets/notification_area/na-tray-manager.c hacked/applets/notification_area/na-tray-manager.c
---- gnome-panel-2.28.0/applets/notification_area/na-tray-manager.c 2009-07-27 08:01:39.000000000 -0400
-+++ hacked/applets/notification_area/na-tray-manager.c 2009-10-17 21:55:00.582062966 -0400
-@@ -653,6 +653,32 @@
+diff -up gnome-panel-2.31.90/applets/notification_area/na-tray-manager.c.icon-padding gnome-panel-2.31.90/applets/notification_area/na-tray-manager.c
+--- gnome-panel-2.31.90/applets/notification_area/na-tray-manager.c.icon-padding 2010-06-22 19:00:27.000000000 -0400
++++ gnome-panel-2.31.90/applets/notification_area/na-tray-manager.c 2010-09-10 13:09:15.737233000 -0400
+@@ -662,6 +662,32 @@ na_tray_manager_set_visual_property (NaT
#endif
}
@@ -183,15 +176,17 @@ diff -u -r gnome-panel-2.28.0/applets/notification_area/na-tray-manager.c hacked
#ifdef GDK_WINDOWING_X11
static gboolean
-@@ -697,6 +723,7 @@
+@@ -707,7 +733,8 @@ na_tray_manager_manage_screen_x11 (NaTra
na_tray_manager_set_orientation_property (manager);
na_tray_manager_set_visual_property (manager);
+-
+ na_tray_manager_set_padding_property (manager);
-
- timestamp = gdk_x11_get_server_time (invisible->window);
++
+ window = gtk_widget_get_window (invisible);
-@@ -836,6 +863,20 @@
+ timestamp = gdk_x11_get_server_time (window);
+@@ -848,6 +875,20 @@ na_tray_manager_set_orientation (NaTrayM
}
}
@@ -212,10 +207,10 @@ diff -u -r gnome-panel-2.28.0/applets/notification_area/na-tray-manager.c hacked
GtkOrientation
na_tray_manager_get_orientation (NaTrayManager *manager)
{
-diff -u -r gnome-panel-2.28.0/applets/notification_area/na-tray-manager.h hacked/applets/notification_area/na-tray-manager.h
---- gnome-panel-2.28.0/applets/notification_area/na-tray-manager.h 2009-04-19 13:45:09.000000000 -0400
-+++ hacked/applets/notification_area/na-tray-manager.h 2009-10-17 21:55:42.646312700 -0400
-@@ -55,6 +55,7 @@
+diff -up gnome-panel-2.31.90/applets/notification_area/na-tray-manager.h.icon-padding gnome-panel-2.31.90/applets/notification_area/na-tray-manager.h
+--- gnome-panel-2.31.90/applets/notification_area/na-tray-manager.h.icon-padding 2010-02-09 07:32:08.000000000 -0500
++++ gnome-panel-2.31.90/applets/notification_area/na-tray-manager.h 2010-09-10 13:07:31.922233001 -0400
+@@ -55,6 +55,7 @@ struct _NaTrayManager
GtkWidget *invisible;
GdkScreen *screen;
GtkOrientation orientation;
@@ -223,7 +218,7 @@ diff -u -r gnome-panel-2.28.0/applets/notification_area/na-tray-manager.h hacked
GList *messages;
GHashTable *socket_table;
-@@ -91,6 +92,8 @@
+@@ -91,6 +92,8 @@ gboolean na_tray_manager_manage_s
void na_tray_manager_set_orientation (NaTrayManager *manager,
GtkOrientation orientation);
GtkOrientation na_tray_manager_get_orientation (NaTrayManager *manager);
@@ -232,9 +227,9 @@ diff -u -r gnome-panel-2.28.0/applets/notification_area/na-tray-manager.h hacked
G_END_DECLS
-diff -u -r gnome-panel-2.28.0/applets/notification_area/notification_area_applet.schemas.in hacked/applets/notification_area/notification_area_applet.schemas.in
---- gnome-panel-2.28.0/applets/notification_area/notification_area_applet.schemas.in 2009-10-17 23:23:41.071058057 -0400
-+++ hacked/applets/notification_area/notification_area_applet.schemas.in 2009-10-17 23:21:38.588316399 -0400
+diff -up gnome-panel-2.31.90/applets/notification_area/notification_area_applet.schemas.in.icon-padding gnome-panel-2.31.90/applets/notification_area/notification_area_applet.schemas.in
+--- gnome-panel-2.31.90/applets/notification_area/notification_area_applet.schemas.in.icon-padding 2010-09-10 13:07:31.923233001 -0400
++++ gnome-panel-2.31.90/applets/notification_area/notification_area_applet.schemas.in 2010-09-10 13:07:31.923233001 -0400
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<gconfschemafile>
More information about the scm-commits
mailing list