[gnome-panel/f14/master] fix a patch
Matthias Clasen
mclasen at fedoraproject.org
Fri Sep 10 17:42:23 UTC 2010
commit 726586c150121daf5f21cfd0b35888c2e7ae0232
Author: Matthias Clasen <mclasen at redhat.com>
Date: Fri Sep 10 13:41:33 2010 -0400
fix a patch
icon-padding.patch | 70 +++++++++++++++++++++++++++++++--------------------
1 files changed, 42 insertions(+), 28 deletions(-)
---
diff --git a/icon-padding.patch b/icon-padding.patch
index 53c2f60..d03225c 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:10:30.425233001 -0400
++++ gnome-panel-2.31.90/applets/notification_area/main.c 2010-09-10 13:39:56.042233000 -0400
@@ -25,6 +25,7 @@
#include <panel-applet.h>
@@ -17,7 +17,39 @@ diff -up gnome-panel-2.31.90/applets/notification_area/main.c.icon-padding gnome
typedef struct
{
-@@ -285,6 +287,39 @@ force_no_focus_padding (GtkWidget *widge
+@@ -211,6 +213,22 @@ free_applet_data (AppletData *data)
+ }
+
+ static void
++setup_gconf (AppletData *data)
++{
++ GConfClient *client;
++ char *key;
++ int value;
++
++ client = gconf_client_get_default ();
++ key = panel_applet_gconf_get_full_key (data->applet, "padding");
++ value = gconf_client_get_int (client, key, NULL);
++ na_tray_set_padding (data->tray, value);
++ gconf_client_notify_add (client, key, padding_changed, data, NULL, NULL);
++ g_free (key);
++ g_object_unref (client);
++}
++
++static void
+ on_applet_realized (GtkWidget *widget,
+ gpointer user_data)
+ {
+@@ -239,6 +257,8 @@ on_applet_realized (GtkWidget *widget,
+ data,
+ (GDestroyNotify) free_applet_data);
+
++ setup_gconf (data);
++
+ 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");
}
@@ -38,26 +70,10 @@ diff -up gnome-panel-2.31.90/applets/notification_area/main.c.icon-padding gnome
+ na_tray_set_padding (data->tray, value);
+}
+
-+static void
-+setup_gconf (AppletData *data)
-+{
-+ GConfClient *client;
-+ char *key;
-+ int value;
-+
-+ client = gconf_client_get_default ();
-+ key = panel_applet_gconf_get_full_key (data->applet, "padding");
-+ value = gconf_client_get_int (client, key, NULL);
-+ na_tray_set_padding (data->tray, value);
-+ gconf_client_notify_add (client, key, padding_changed, data, NULL, NULL);
-+ g_free (key);
-+ g_object_unref (client);
-+}
-+
static gboolean
applet_factory (PanelApplet *applet,
const gchar *iid,
-@@ -305,9 +340,12 @@ applet_factory (PanelApplet *applet,
+@@ -305,9 +342,10 @@ applet_factory (PanelApplet *applet,
atko = gtk_widget_get_accessible (GTK_WIDGET (applet));
atk_object_set_name (atko, _("Panel Notification Area"));
@@ -66,14 +82,12 @@ diff -up gnome-panel-2.31.90/applets/notification_area/main.c.icon-padding gnome
PANEL_APPLET_HAS_HANDLE|PANEL_APPLET_EXPAND_MINOR);
-
+
-+ setup_gconf (data);
-+
panel_applet_set_background_widget (applet, GTK_WIDGET (applet));
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
++++ gnome-panel-2.31.90/applets/notification_area/Makefile.am 2010-09-10 13:19:07.917233001 -0400
@@ -78,6 +78,24 @@ org.gnome.panel.applet.NotificationAreaA
$< > $@
endif
@@ -101,7 +115,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:07:31.917233001 -0400
++++ gnome-panel-2.31.90/applets/notification_area/na-tray.c 2010-09-10 13:19:07.918233001 -0400
@@ -624,6 +624,8 @@ na_tray_constructor (GType type,
{
trays_screens [screen_number].tray_manager = tray_manager;
@@ -130,7 +144,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:07:31.919233001 -0400
++++ gnome-panel-2.31.90/applets/notification_area/na-tray.h 2010-09-10 13:19:07.920233001 -0400
@@ -60,6 +60,8 @@ NaTray *na_tray_new_for_screen
void na_tray_set_orientation (NaTray *tray,
GtkOrientation orientation);
@@ -142,7 +156,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:09:15.737233000 -0400
++++ gnome-panel-2.31.90/applets/notification_area/na-tray-manager.c 2010-09-10 13:19:07.921233001 -0400
@@ -662,6 +662,32 @@ na_tray_manager_set_visual_property (NaT
#endif
}
@@ -209,7 +223,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:07:31.922233001 -0400
++++ gnome-panel-2.31.90/applets/notification_area/na-tray-manager.h 2010-09-10 13:19:07.923233001 -0400
@@ -55,6 +55,7 @@ struct _NaTrayManager
GtkWidget *invisible;
GdkScreen *screen;
@@ -228,8 +242,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: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
+--- 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
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<gconfschemafile>
More information about the scm-commits
mailing list