[gnome-panel/f14/master] fix patch
Matthias Clasen
mclasen at fedoraproject.org
Fri Sep 10 17:52:39 UTC 2010
commit 0d94d00b0878f482cb9a0498107306c4f6b1acaf
Author: Matthias Clasen <mclasen at redhat.com>
Date: Fri Sep 10 13:51:59 2010 -0400
fix patch
icon-padding.patch | 61 +++++++++++++++++++++++-----------------------------
1 files changed, 27 insertions(+), 34 deletions(-)
---
diff --git a/icon-padding.patch b/icon-padding.patch
index d03225c..87c23f2 100644
--- a/icon-padding.patch
+++ b/icon-padding.patch
@@ -1,6 +1,6 @@
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:39:56.042233000 -0400
++++ gnome-panel-2.31.90/applets/notification_area/main.c 2010-09-10 13:51:43.226233000 -0400
@@ -25,6 +25,7 @@
#include <panel-applet.h>
@@ -17,10 +17,27 @@ diff -up gnome-panel-2.31.90/applets/notification_area/main.c.icon-padding gnome
typedef struct
{
-@@ -211,6 +213,22 @@ free_applet_data (AppletData *data)
+@@ -211,6 +213,39 @@ free_applet_data (AppletData *data)
}
static void
++padding_changed (GConfClient *client,
++ guint cnxn_id,
++ GConfEntry *entry,
++ gpointer user_data)
++{
++ AppletData *data = user_data;
++ gint value;
++
++ if (!entry->value || entry->value->type != GCONF_VALUE_INT)
++ return;
++
++ value = gconf_value_get_int (entry->value);
++
++ na_tray_set_padding (data->tray, value);
++}
++
++static void
+setup_gconf (AppletData *data)
+{
+ GConfClient *client;
@@ -40,7 +57,7 @@ diff -up gnome-panel-2.31.90/applets/notification_area/main.c.icon-padding gnome
on_applet_realized (GtkWidget *widget,
gpointer user_data)
{
-@@ -239,6 +257,8 @@ on_applet_realized (GtkWidget *widget,
+@@ -239,6 +274,8 @@ on_applet_realized (GtkWidget *widget,
data,
(GDestroyNotify) free_applet_data);
@@ -49,30 +66,6 @@ diff -up gnome-panel-2.31.90/applets/notification_area/main.c.icon-padding gnome
g_signal_connect (applet, "change_orient",
G_CALLBACK (applet_change_orientation), data);
g_signal_connect (applet, "change_background",
-@@ -285,6 +305,23 @@ force_no_focus_padding (GtkWidget *widge
- gtk_widget_set_name (widget, "na-tray");
- }
-
-+static void
-+padding_changed (GConfClient *client,
-+ guint cnxn_id,
-+ GConfEntry *entry,
-+ gpointer user_data)
-+{
-+ AppletData *data = user_data;
-+ gint value;
-+
-+ if (!entry->value || entry->value->type != GCONF_VALUE_INT)
-+ return;
-+
-+ value = gconf_value_get_int (entry->value);
-+
-+ na_tray_set_padding (data->tray, value);
-+}
-+
- static gboolean
- applet_factory (PanelApplet *applet,
- const gchar *iid,
@@ -305,9 +342,10 @@ applet_factory (PanelApplet *applet,
atko = gtk_widget_get_accessible (GTK_WIDGET (applet));
atk_object_set_name (atko, _("Panel Notification Area"));
@@ -87,7 +80,7 @@ diff -up gnome-panel-2.31.90/applets/notification_area/main.c.icon-padding gnome
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:19:07.917233001 -0400
++++ gnome-panel-2.31.90/applets/notification_area/Makefile.am 2010-09-10 13:40:27.214233000 -0400
@@ -78,6 +78,24 @@ org.gnome.panel.applet.NotificationAreaA
$< > $@
endif
@@ -115,7 +108,7 @@ diff -up gnome-panel-2.31.90/applets/notification_area/Makefile.am.icon-padding
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:19:07.918233001 -0400
++++ gnome-panel-2.31.90/applets/notification_area/na-tray.c 2010-09-10 13:40:27.216233000 -0400
@@ -624,6 +624,8 @@ na_tray_constructor (GType type,
{
trays_screens [screen_number].tray_manager = tray_manager;
@@ -144,7 +137,7 @@ diff -up gnome-panel-2.31.90/applets/notification_area/na-tray.c.icon-padding gn
NaTrayPrivate *priv = tray->priv;
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:19:07.920233001 -0400
++++ gnome-panel-2.31.90/applets/notification_area/na-tray.h 2010-09-10 13:40:27.218233000 -0400
@@ -60,6 +60,8 @@ NaTray *na_tray_new_for_screen
void na_tray_set_orientation (NaTray *tray,
GtkOrientation orientation);
@@ -156,7 +149,7 @@ diff -up gnome-panel-2.31.90/applets/notification_area/na-tray.h.icon-padding gn
G_END_DECLS
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:19:07.921233001 -0400
++++ gnome-panel-2.31.90/applets/notification_area/na-tray-manager.c 2010-09-10 13:40:27.220233000 -0400
@@ -662,6 +662,32 @@ na_tray_manager_set_visual_property (NaT
#endif
}
@@ -223,7 +216,7 @@ diff -up gnome-panel-2.31.90/applets/notification_area/na-tray-manager.c.icon-pa
{
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:19:07.923233001 -0400
++++ gnome-panel-2.31.90/applets/notification_area/na-tray-manager.h 2010-09-10 13:40:27.222233000 -0400
@@ -55,6 +55,7 @@ struct _NaTrayManager
GtkWidget *invisible;
GdkScreen *screen;
@@ -242,8 +235,8 @@ diff -up gnome-panel-2.31.90/applets/notification_area/na-tray-manager.h.icon-pa
G_END_DECLS
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:19:07.924233001 -0400
-+++ gnome-panel-2.31.90/applets/notification_area/notification_area_applet.schemas.in 2010-09-10 13:19:07.924233001 -0400
+--- gnome-panel-2.31.90/applets/notification_area/notification_area_applet.schemas.in.icon-padding 2010-09-10 13:40:27.223233000 -0400
++++ gnome-panel-2.31.90/applets/notification_area/notification_area_applet.schemas.in 2010-09-10 13:40:27.223233000 -0400
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<gconfschemafile>
More information about the scm-commits
mailing list