rpms/planner/F-12 planner-gnome604169-comboboxentry.patch,1.1,1.2

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	planner-gnome604169-comboboxentry.patch 
Log Message:
Resolves: rhbz#545711 defuzz patch

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

Index: planner-gnome604169-comboboxentry.patch
===================================================================
RCS file: /cvs/pkgs/rpms/planner/F-12/planner-gnome604169-comboboxentry.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- planner-gnome604169-comboboxentry.patch	9 Dec 2009 12:34:58 -0000	1.1
+++ planner-gnome604169-comboboxentry.patch	9 Dec 2009 12:52:38 -0000	1.2
@@ -1,6 +1,6 @@
 diff -ru planner-0.14.4.orig/data/glade/add-predecessor.glade planner-0.14.4/data/glade/add-predecessor.glade
---- planner-0.14.4.orig/data/glade/add-predecessor.glade	2009-12-09 11:28:46.000000000 +0000
-+++ planner-0.14.4/data/glade/add-predecessor.glade	2009-12-09 11:34:54.000000000 +0000
+--- planner-0.14.4.orig/data/glade/add-predecessor.glade	2009-12-09 12:48:03.000000000 +0000
++++ planner-0.14.4/data/glade/add-predecessor.glade	2009-12-09 12:48:16.000000000 +0000
 @@ -88,7 +88,6 @@
  	      <property name="yalign">0.5</property>
  	      <property name="xpad">0</property>
@@ -88,9 +88,9 @@ diff -ru planner-0.14.4.orig/data/glade/
  	<packing>
  	  <property name="padding">0</property>
 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 11:28:46.000000000 +0000
-+++ planner-0.14.4/src/planner-task-dialog.c	2009-12-09 12:12:55.000000000 +0000
-@@ -350,58 +350,43 @@
+--- 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 @@
  #endif
  
  static void
@@ -101,7 +101,6 @@ diff -ru planner-0.14.4.orig/src/planner
 -	MrpTask *task;
 -
 -	task = g_object_get_data (G_OBJECT (item), "task");
--	fprintf(stderr, "task_dialog_setup_task_combo child %p, had task %p\n", item, task);
 -	g_object_set_data (G_OBJECT (combo), "selected_task", task);
 -}
 -
@@ -123,26 +122,24 @@ diff -ru planner-0.14.4.orig/src/planner
  	if (tasks == NULL) {
  		return;
  	}
-+
-+	store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_POINTER);
  	
 -	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,
 -						  _("(No name)"));
 +			gtk_list_store_set (store, &iter,
-+					    0, _("(No name)"),
-+					    1, l->data,
-+					    -1);
++			                    0, _("(No name)"),
++			                    1, l->data,
++			                    -1);
  		} else {
 -			strings = g_list_prepend (strings, (gchar*) name);
 +			gtk_list_store_set (store, &iter,
-+					    0, name,
-+					    1, l->data,
-+					    -1);
++			                    0, name,
++			                    1, l->data,
++			                    -1);
  		}
  	}
  
@@ -155,7 +152,6 @@ diff -ru planner-0.14.4.orig/src/planner
 -	children = GTK_LIST (combo->list)->children;
 -	for (l = children; l; l = l->next) {
 -		g_object_set_data (G_OBJECT (l->data), "task", tasks->data);
--		fprintf(stderr, "child %p, given task %p\n", l, tasks->data);
 -		tasks = tasks->next;
 -	}
 -	
@@ -164,7 +160,7 @@ diff -ru planner-0.14.4.orig/src/planner
 -			  G_CALLBACK (task_dialog_task_combo_select_child_cb),
 -			  combo);
 +	gtk_combo_box_set_model (GTK_COMBO_BOX (combo), 
-+				 GTK_TREE_MODEL (store));
++	                         GTK_TREE_MODEL (store));
 +
 +	gtk_combo_box_entry_set_text_column (combo, 0);
 +
@@ -172,7 +168,7 @@ diff -ru planner-0.14.4.orig/src/planner
  }
  
  static gboolean
-@@ -1908,7 +1893,7 @@
+@@ -1906,7 +1891,7 @@
  	
  	tasks = mrp_project_get_all_tasks (project);
  	tasks = g_list_remove (tasks, task);
@@ -181,7 +177,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);
-@@ -1949,10 +1934,11 @@
+@@ -1947,10 +1932,11 @@
  	GtkWidget     *w;
  	GError        *error = NULL;
  	MrpTask       *task_main;
@@ -194,7 +190,7 @@ diff -ru planner-0.14.4.orig/src/planner
  	const gchar   *str;
  	
  	main_window = g_object_get_data (G_OBJECT (dialog), "main_window");
-@@ -1972,7 +1958,11 @@
+@@ -1970,7 +1956,11 @@
  	/* Predecessor task. */
  	w = g_object_get_data (G_OBJECT (dialog), "predecessor_combo");