rpms/moblin-panel-people/devel mpp-nbtk12.patch, NONE, 1.1 moblin-panel-people.spec, 1.2, 1.3

[Peter Robinson]

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-people/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5304

Modified Files:
	moblin-panel-people.spec 
Added Files:
	mpp-nbtk12.patch 
Log Message:
- Add patch for nbtk-1.2 api

mpp-nbtk12.patch:
 configure.ac           |    2 +-
 src/mnb-people-panel.c |    7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

--- NEW FILE mpp-nbtk12.patch ---
>From 2209855447809359f400ac64b1cd5a530fb51171 Mon Sep 17 00:00:00 2001
From: Thomas Wood <thomas.wood at intel.com>
Date: Tue, 15 Sep 2009 15:23:14 +0000
Subject: Update for API changes in nbtk-1.2

---
diff --git a/configure.ac b/configure.ac
index 31db938..9a05d5a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ PKG_CHECK_MODULES(MPL, moblin-panel)
 PKG_CHECK_MODULES(PEOPLE,
                   anerley
                   gtk+-2.0 >= 2.14
-                  nbtk-1.0
+                  nbtk-1.2
                   gio-2.0
                   gio-unix-2.0)
 
diff --git a/src/mnb-people-panel.c b/src/mnb-people-panel.c
index 833f9a0..f7ea2ff 100644
--- a/src/mnb-people-panel.c
+++ b/src/mnb-people-panel.c
@@ -329,7 +329,7 @@ _make_empty_people_tile (MnbPeoplePanel *people_panel,
                                         "x-align",
                                         0.0,
                                         NULL);
-  nbtk_bin_set_alignment (NBTK_BIN (bin), NBTK_ALIGN_LEFT, NBTK_ALIGN_CENTER);
+  nbtk_bin_set_alignment (NBTK_BIN (bin), NBTK_ALIGN_START, NBTK_ALIGN_MIDDLE);
 
   priv->app_info = (GAppInfo *)g_desktop_app_info_new ("empathy-accounts.desktop");
 
@@ -748,8 +748,8 @@ mnb_people_panel_init (MnbPeoplePanel *self)
   clutter_container_add_actor (CLUTTER_CONTAINER (priv->nobody_selected_box),
                                (ClutterActor *)label);
   nbtk_bin_set_alignment (NBTK_BIN (priv->nobody_selected_box),
-                          NBTK_ALIGN_CENTER,
-                          NBTK_ALIGN_TOP);
+                          NBTK_ALIGN_MIDDLE,
+                          NBTK_ALIGN_START);
   nbtk_bin_set_fill (NBTK_BIN (priv->nobody_selected_box),
                      FALSE,
                      FALSE);
--
cgit v0.8.2


Index: moblin-panel-people.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/devel/moblin-panel-people.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- moblin-panel-people.spec	28 Sep 2009 21:37:23 -0000	1.2
+++ moblin-panel-people.spec	29 Sep 2009 09:24:06 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           moblin-panel-people
 Version:        0.0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Moblin Panel for People
 
 Group:          System Environment/Libraries
@@ -25,6 +25,8 @@ BuildRequires: gnome-common
 # git show -p 51b916b3dbf79f6729591f7567c34e1ac2aef98d~2..
 # On the mc5 branch of git://git.collabora.co.uk/git/user/jonny/moblin-panel-people.git
 Patch0:        mpp-mc5-port.patch
+# http://git.moblin.org/cgit.cgi/moblin-panel-people/commit/?id=2209855447809359f400ac64b1cd5a530fb51171
+Patch1:        mpp-nbtk12.patch
 
 Requires: dbus
 
@@ -33,6 +35,7 @@ The Moblin mutter panel for managing and
 
 %prep
 %setup -q
+%patch1 -p1 -b .nbtk12
 %patch0 -p1 -b .mc5
 
 # run autogen.sh until we have a proper release, but don't run configure twice.
@@ -59,6 +62,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Tue Sep 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.1-3
+- Add patch for nbtk-1.2 api
+
 * Mon Sep 28 2009 Bastien Nocera <bnocera at redhat.com> 0.0.1-2
 - Add patch to port to new Mission Control