rpms/gkrellm-volume/F-12 gkrellm-volume-2.1.13-device-updown-552022.patch, NONE, 1.1 gkrellm-volume.spec, 1.16, 1.17

[Ville Skyttä]

Author: scop

Update of /cvs/pkgs/rpms/gkrellm-volume/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28957/F-12

Modified Files:
	gkrellm-volume.spec 
Added Files:
	gkrellm-volume-2.1.13-device-updown-552022.patch 
Log Message:
* Mon Jan  4 2010 Ville Skyttä <ville.skytta at iki.fi> - 2.1.13-12
- Patch to fix crash when moving devices up/down in config (#552022).


gkrellm-volume-2.1.13-device-updown-552022.patch:
 volume.c |   51 +++++++++++++--------------------------------------
 1 file changed, 13 insertions(+), 38 deletions(-)

--- NEW FILE gkrellm-volume-2.1.13-device-updown-552022.patch ---
https://bugzilla.redhat.com/show_bug.cgi?id=552022

diff -up gkrellm-volume/volume.c~ gkrellm-volume/volume.c
--- gkrellm-volume/volume.c~	2004-08-19 23:07:27.000000000 +0300
+++ gkrellm-volume/volume.c	2010-01-04 21:18:25.000000000 +0200
@@ -620,72 +620,47 @@ device_name_edited(GtkCellRendererText *
 }
 
 static void up_clicked(GtkWidget *widget,gpointer user_data) {
-  GtkTreeIter selected,up,new;
+  GtkTreeIter selected,up;
   GtkTreeView *view = GTK_TREE_VIEW(user_data);
   GtkTreeSelection *selection;
   GtkTreeModel *model;
   GtkTreePath *path;
-  gchar *name,*id;
-  gpointer *child_model,*nb;
 
   selection = gtk_tree_view_get_selection(view);
 
   if (!gtk_tree_selection_get_selected(selection,&model,&selected)) return;
-  gtk_tree_model_get(model,&selected,
-       ID_COLUMN,&id,
-       NAME_COLUMN,&name,
-       C_MODEL_COLUMN,&child_model,
-       C_NB_COLUMN,&nb,
-        -1);
 
   path = gtk_tree_model_get_path(model,&selected);
-  if (!gtk_tree_path_prev(path)) return;
-  if (!gtk_tree_model_get_iter(model,&up,path)) return;
-  gtk_list_store_remove(GTK_LIST_STORE(model),&selected);
-  gtk_list_store_insert_before(GTK_LIST_STORE(model),&new,&up);
-
-  gtk_list_store_set(GTK_LIST_STORE(model),&new,
-       ID_COLUMN,id,
-       NAME_COLUMN,name,
-       C_MODEL_COLUMN,child_model,
-       C_NB_COLUMN,nb,
-       -1);
+  if (!gtk_tree_path_prev(path)) goto out;
+  if (!gtk_tree_model_get_iter(model,&up,path)) goto out;
+
+  gtk_list_store_swap(GTK_LIST_STORE(model),&selected,&up);
   mixer_config_changed = TRUE;
 
+ out:
+  gtk_tree_path_free(path);
 }
 
 static void down_clicked(GtkWidget *widget,gpointer user_data) {
-  GtkTreeIter selected,down,new;
+  GtkTreeIter selected,down;
   GtkTreeView *view = GTK_TREE_VIEW(user_data);
   GtkTreeSelection *selection;
   GtkTreeModel *model;
   GtkTreePath *path;
-  gchar *name,*id;
-  gpointer *child_model,*nb;
 
   selection = gtk_tree_view_get_selection(view);
 
   if (!gtk_tree_selection_get_selected(selection,&model,&selected)) return;
-  gtk_tree_model_get(model,&selected,
-       ID_COLUMN,&id,
-       NAME_COLUMN,&name,
-       C_MODEL_COLUMN,&child_model,
-       C_NB_COLUMN,&nb,
-        -1);
 
   path = gtk_tree_model_get_path(model,&selected);
   gtk_tree_path_next(path);
-  if (!gtk_tree_model_get_iter(model,&down,path)) return;
-  gtk_list_store_insert_after(GTK_LIST_STORE(model),&new,&down);
+  if (!gtk_tree_model_get_iter(model,&down,path)) goto out;
 
-  gtk_list_store_set(GTK_LIST_STORE(model),&new,
-       ID_COLUMN,id,
-       NAME_COLUMN,name,
-       C_MODEL_COLUMN,child_model,
-       C_NB_COLUMN,nb,
-       -1);
+  gtk_list_store_swap(GTK_LIST_STORE(model),&selected,&down);
   mixer_config_changed = TRUE;
-  gtk_list_store_remove(GTK_LIST_STORE(model),&selected);
+
+ out:
+  gtk_tree_path_free(path);
 }
 
 static GtkWidget *


Index: gkrellm-volume.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm-volume/F-12/gkrellm-volume.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- gkrellm-volume.spec	2 Sep 2009 20:43:28 -0000	1.16
+++ gkrellm-volume.spec	4 Jan 2010 20:47:23 -0000	1.17
@@ -2,16 +2,20 @@
 
 Name:           gkrellm-volume
 Version:        2.1.13
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        GKrellM volume plugin
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://gkrellm.luon.net/volume.php
 Source0:        http://gkrellm.luon.net/files/%{name}-%{version}.tar.gz
+# Mailed upstream 2010-01-04
 Patch0:         %{name}-version.patch
+# Mailed upstream 2010-01-04
 Patch1:         %{name}-optflags.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+# Mailed upstream 2010-01-04, #552022
+Patch2:         %{name}-2.1.13-device-updown-552022.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gkrellm-devel >= 2.0
 BuildRequires:  gtk2-devel >= 2.0.1
@@ -31,6 +35,7 @@ GKrellM plugin for controlling mixer dev
 %setup -q -n %{name}
 %patch0
 %patch1
+%patch2 -p1
 f=Changelog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
 
 
@@ -60,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jan  4 2010 Ville Skyttä <ville.skytta at iki.fi> - 2.1.13-12
+- Patch to fix crash when moving devices up/down in config (#552022).
+
 * Wed Sep  2 2009 Ville Skyttä <ville.skytta at iki.fi> - 2.1.13-11
 - Filter out autoprovided volume.so (if %%filter_setup is available).