rpms/planner/F-12 planner-gnome604169-comboboxentry.patch, 1.2, 1.3 planner.spec, 1.77, 1.78

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/planner/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2833/F-12

Modified Files:
	planner-gnome604169-comboboxentry.patch planner.spec 
Log Message:
Resolves: rhbz#554222 fix combo dropdown

planner-gnome604169-comboboxentry.patch:
 data/glade/add-predecessor.glade |   58 ++++++++++----------------------
 src/planner-task-dialog.c        |   69 ++++++++++++++++-----------------------
 2 files changed, 48 insertions(+), 79 deletions(-)

Index: planner-gnome604169-comboboxentry.patch
===================================================================
RCS file: /cvs/pkgs/rpms/planner/F-12/planner-gnome604169-comboboxentry.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- planner-gnome604169-comboboxentry.patch	9 Dec 2009 12:52:38 -0000	1.2
+++ planner-gnome604169-comboboxentry.patch	11 Jan 2010 09:03:04 -0000	1.3
@@ -90,7 +90,7 @@ diff -ru planner-0.14.4.orig/data/glade/
 diff -ru planner-0.14.4.orig/src/planner-task-dialog.c planner-0.14.4/src/planner-task-dialog.c
 --- planner-0.14.4.orig/src/planner-task-dialog.c	2009-12-09 12:48:03.000000000 +0000
 +++ planner-0.14.4/src/planner-task-dialog.c	2009-12-09 12:50:21.000000000 +0000
-@@ -350,56 +350,41 @@
+@@ -350,56 +350,42 @@
  #endif
  
  static void
@@ -126,6 +126,7 @@ diff -ru planner-0.14.4.orig/src/planner
 -	strings = NULL;
 +	store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_POINTER);
  	for (l = tasks; l; l = l->next) {
++		gtk_list_store_append (store, &iter);
  		name = mrp_task_get_name (l->data);
  		if (name == NULL || name[0] == 0) {
 -			strings = g_list_prepend (strings,
@@ -168,7 +169,7 @@ diff -ru planner-0.14.4.orig/src/planner
  }
  
  static gboolean
-@@ -1906,7 +1891,7 @@
+@@ -1906,7 +1892,7 @@
  	
  	tasks = mrp_project_get_all_tasks (project);
  	tasks = g_list_remove (tasks, task);
@@ -177,7 +178,7 @@ diff -ru planner-0.14.4.orig/src/planner
  	
  	w = glade_xml_get_widget (glade, "type_optionmenu");
  	g_object_set_data (G_OBJECT (dialog), "type_optionmenu", w);
-@@ -1947,10 +1932,11 @@
+@@ -1947,10 +1933,11 @@
  	GtkWidget     *w;
  	GError        *error = NULL;
  	MrpTask       *task_main;
@@ -190,7 +191,7 @@ diff -ru planner-0.14.4.orig/src/planner
  	const gchar   *str;
  	
  	main_window = g_object_get_data (G_OBJECT (dialog), "main_window");
-@@ -1970,7 +1956,11 @@
+@@ -1970,7 +1957,11 @@
  	/* Predecessor task. */
  	w = g_object_get_data (G_OBJECT (dialog), "predecessor_combo");
  


Index: planner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/planner/F-12/planner.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- planner.spec	21 Dec 2009 09:33:50 -0000	1.77
+++ planner.spec	11 Jan 2010 09:03:04 -0000	1.78
@@ -1,7 +1,7 @@
 Summary:   A graphical project management tool
 Name:      planner
 Version:   0.14.4
-Release:   12%{?dist}
+Release:   13%{?dist}
 License:   GPLv2+
 Group:     Applications/Productivity
 URL:       http://live.gnome.org/Planner
@@ -171,6 +171,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Jan 11 2010 Caolán McNamara <caolanm at redhat.com> - 0.14.4-13
+- Resolves: rhbz#554222 fix combo dropdown
+
 * Mon Dec 21 2009 Caolán McNamara <caolanm at redhat.com> - 0.14.4-12
 - Resolves: rhbz#548830 crash in print preview