file-roller r2572 - in trunk: . data/ui src

[paobac svn gnome org]

Author: paobac
Date: Wed Feb  4 18:14:14 2009
New Revision: 2572
URL: http://svn.gnome.org/viewvc/file-roller?rev=2572&view=rev

Log:
2009-02-04  Paolo Bacchilega  <paobac svn gnome org>

	* data/ui/new.ui: 
	* data/ui/batch-add-files.ui: 
	
	Fixed spin button adjustment.
	
	* src/dlg-new.c: 
	
	Fixed bug #570505 â file-roller crashed with signal 5 in 
	IA__g_malloc()


Modified:
   trunk/ChangeLog
   trunk/data/ui/batch-add-files.ui
   trunk/data/ui/new.ui
   trunk/src/dlg-new.c

Modified: trunk/data/ui/batch-add-files.ui
==============================================================================
--- trunk/data/ui/batch-add-files.ui	(original)
+++ trunk/data/ui/batch-add-files.ui	Wed Feb  4 18:14:14 2009
@@ -208,7 +208,7 @@
                                   <object class="GtkSpinButton" id="a_volume_spinbutton">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="adjustment"></property>
+                                    <property name="adjustment">volume_adjustment</property>
                                     <property name="climb_rate">1</property>
                                     <property name="digits">1</property>
                                     <property name="numeric">True</property>
@@ -366,4 +366,11 @@
       <action-widget response="-11">a_help_button</action-widget>
     </action-widgets>
   </object>
+  <object class="GtkAdjustment" id="volume_adjustment">
+    <property name="value">10</property>
+    <property name="lower">0.10000000000000001</property>
+    <property name="upper">1000</property>
+    <property name="step_increment">0.10000000000000001</property>
+    <property name="page_increment">10</property>
+  </object>
 </interface>

Modified: trunk/data/ui/new.ui
==============================================================================
--- trunk/data/ui/new.ui	(original)
+++ trunk/data/ui/new.ui	Wed Feb  4 18:14:14 2009
@@ -154,7 +154,7 @@
                               <object class="GtkSpinButton" id="n_volume_spinbutton">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="adjustment">adjustment1</property>
+                                <property name="adjustment">volume_adjustment</property>
                                 <property name="climb_rate">1</property>
                                 <property name="digits">1</property>
                                 <property name="numeric">True</property>
@@ -263,7 +263,7 @@
       <action-widget response="-11">n_help_button</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkAdjustment" id="adjustment1">
+  <object class="GtkAdjustment" id="volume_adjustment">
     <property name="value">10</property>
     <property name="lower">0.10000000149</property>
     <property name="upper">1000</property>

Modified: trunk/src/dlg-new.c
==============================================================================
--- trunk/src/dlg-new.c	(original)
+++ trunk/src/dlg-new.c	Wed Feb  4 18:14:14 2009
@@ -154,7 +154,10 @@
 			
 		new_ext = mime_type_desc[data->supported_types[idx]].default_ext;
 		basename = file_name_from_path (uri);
-		basename_noext = g_strndup (basename, strlen (basename) - strlen (ext));
+		if (g_str_has_suffix (basename, ext)) 
+			basename_noext = g_strndup (basename, strlen (basename) - strlen (ext));
+		else
+			basename_noext = g_strdup (basename);
 		new_basename = g_strconcat (basename_noext, new_ext, NULL);
 		new_basename_uft8 = g_uri_unescape_string (new_basename, NULL);