[baobab/import-export: 2/5] Patch libgd

[Stefano Facchini <sfacchini src gnome org>]

commit 01f181dfb1bab13bfb54715c9362d55256d67fa0
Author: Stefano Facchini <stefano facchini gmail com>
Date:   Sun Sep 9 13:47:53 2012 +0200

    Patch libgd

 0001-main-toolbar-Add-an-add_widget-method.patch   |   67 ++++++++++++++++++++
 ...r-Use-end-alignment-for-the-right-section.patch |   25 +++++++
 autogen.sh                                         |    5 ++
 3 files changed, 97 insertions(+), 0 deletions(-)
---
diff --git a/0001-main-toolbar-Add-an-add_widget-method.patch b/0001-main-toolbar-Add-an-add_widget-method.patch
new file mode 100644
index 0000000..476a0d2
--- /dev/null
+++ b/0001-main-toolbar-Add-an-add_widget-method.patch
@@ -0,0 +1,67 @@
+From 43ace412caeb5025d423c48869438c2587990e21 Mon Sep 17 00:00:00 2001
+From: Stefano Facchini <stefano facchini gmail com>
+Date: Sat, 8 Sep 2012 16:37:06 +0200
+Subject: [PATCH 1/2] main-toolbar: Add an add_widget method
+
+https://bugzilla.gnome.org/show_bug.cgi?id=683632
+---
+ libgd/gd-main-toolbar.c | 23 +++++++++++++++++++----
+ libgd/gd-main-toolbar.h |  4 ++++
+ 2 file modificati, 23 inserzioni(+), 4 rimozioni(-)
+
+diff --git a/libgd/gd-main-toolbar.c b/libgd/gd-main-toolbar.c
+index a6b35cf..dbaf6d2 100644
+--- a/libgd/gd-main-toolbar.c
++++ b/libgd/gd-main-toolbar.c
+@@ -344,10 +344,7 @@ add_button_internal (GdMainToolbar *self,
+       button = get_empty_button (type);
+     }
+ 
+-  if (pack_start)
+-    gtk_container_add (GTK_CONTAINER (self->priv->left_grid), button);
+-  else
+-    gtk_container_add (GTK_CONTAINER (self->priv->right_grid), button);    
++  gd_main_toolbar_add_widget (self, button, pack_start);
+ 
+   gtk_widget_show_all (button);
+ 
+@@ -466,3 +463,21 @@ gd_main_toolbar_add_toggle (GdMainToolbar *self,
+ {
+   return add_button_internal (self, icon_name, label, pack_start, CHILD_TOGGLE);
+ }
++
++/**
++ * gd_main_toolbar_add_widget:
++ * @self:
++ * @widget:
++ * @pack_start:
++ *
++ */
++void
++gd_main_toolbar_add_widget (GdMainToolbar *self,
++                            GtkWidget *widget,
++                            gboolean pack_start)
++{
++  if (pack_start)
++    gtk_container_add (GTK_CONTAINER (self->priv->left_grid), widget);
++  else
++    gtk_container_add (GTK_CONTAINER (self->priv->right_grid), widget);
++}
+diff --git a/libgd/gd-main-toolbar.h b/libgd/gd-main-toolbar.h
+index 6ad8c3a..56f7b2b 100644
+--- a/libgd/gd-main-toolbar.h
++++ b/libgd/gd-main-toolbar.h
+@@ -94,6 +94,10 @@ GtkWidget * gd_main_toolbar_add_menu (GdMainToolbar *self,
+                                       const gchar *label,
+                                       gboolean pack_start);
+ 
++void        gd_main_toolbar_add_widget (GdMainToolbar *self,
++                                        GtkWidget *widget,
++                                        gboolean pack_start);
++
+ G_END_DECLS
+ 
+ #endif /* __GD_MAIN_TOOLBAR_H__ */
+-- 
+1.7.12
+
diff --git a/0002-main-toolbar-Use-end-alignment-for-the-right-section.patch b/0002-main-toolbar-Use-end-alignment-for-the-right-section.patch
new file mode 100644
index 0000000..238ea4b
--- /dev/null
+++ b/0002-main-toolbar-Use-end-alignment-for-the-right-section.patch
@@ -0,0 +1,25 @@
+From d732718d14abb1105409c330af494b3900c0fbcc Mon Sep 17 00:00:00 2001
+From: Stefano Facchini <stefano facchini gmail com>
+Date: Sun, 9 Sep 2012 11:59:35 +0200
+Subject: [PATCH 2/2] main-toolbar: Use end alignment for the right section
+
+https://bugzilla.gnome.org/show_bug.cgi?id=683659
+---
+ libgd/gd-main-toolbar.c | 1 +
+ 1 file modificato, 1 inserzione(+)
+
+diff --git a/libgd/gd-main-toolbar.c b/libgd/gd-main-toolbar.c
+index dbaf6d2..a95cafb 100644
+--- a/libgd/gd-main-toolbar.c
++++ b/libgd/gd-main-toolbar.c
+@@ -234,6 +234,7 @@ gd_main_toolbar_constructed (GObject *obj)
+   self->priv->right_grid = gtk_grid_new ();
+   gtk_grid_set_column_spacing (GTK_GRID (self->priv->right_grid), 12);
+   gtk_container_add (GTK_CONTAINER (self->priv->right_group), self->priv->right_grid);
++  gtk_widget_set_halign (self->priv->right_grid, GTK_ALIGN_END);
+ 
+   self->priv->size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+   gtk_size_group_add_widget (self->priv->size_group, GTK_WIDGET (self->priv->left_group));
+-- 
+1.7.12
+
diff --git a/autogen.sh b/autogen.sh
index 33cd06e..2e52c90 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -7,6 +7,11 @@ test -n "$srcdir" || srcdir=.
 OLDDIR=`pwd`
 cd $srcdir
 
+(
+  cd libgd
+  git am ../0001-main-toolbar-Add-an-add_widget-method.patch
+  git am ../0002-main-toolbar-Use-end-alignment-for-the-right-section.patch
+)
 
 AUTORECONF=`which autoreconf`
 if test -z $AUTORECONF; then