anjuta r3555 - in trunk: . plugins/patch plugins/profiler



Author: jhs
Date: Thu Jan 31 18:58:37 2008
New Revision: 3555
URL: http://svn.gnome.org/viewvc/anjuta?rev=3555&view=rev

Log:
2008-01-31  Johannes Schmid <jhs gnome org>

	* plugins/patch/patch-plugin.glade:
	Fixed button ui problem...
	
	Patch from James Liggett:
	* plugins/profiler/gprof-call-graph-block-entry.c:
	(gprof_call_graph_block_primary_entry_new),
	(gprof_call_graph_block_secondary_entry_new):
	* plugins/profiler/gprof-flat-profile-entry.c:
	(gprof_flat_profile_entry_new):
	
	Fix #507831 - Wrong Profiler values for some locales

Modified:
   trunk/ChangeLog
   trunk/plugins/patch/patch-plugin.glade
   trunk/plugins/profiler/gprof-call-graph-block-entry.c
   trunk/plugins/profiler/gprof-flat-profile-entry.c

Modified: trunk/plugins/patch/patch-plugin.glade
==============================================================================
--- trunk/plugins/patch/patch-plugin.glade	(original)
+++ trunk/plugins/patch/patch-plugin.glade	Thu Jan 31 18:58:37 2008
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!-- Generated with glade3
+<!--Generated with glade3 3.4.0 on Thu Jan 31 19:51:34 2008 
 	Version: 2.91.3
 	Date: Sat Jul 29 21:16:15 2006
 	User: jhs
@@ -26,40 +26,34 @@
               <placeholder/>
             </child>
             <child>
-              <widget class="GtkCheckButton" id="dryrun">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Dry run</property>
-                <property name="draw_indicator">True</property>
-              </widget>
-              <packing>
-                <property name="right_attach">2</property>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkLabel" id="output">
-                <property name="visible">True</property>
+              <widget class="GtkHScale" id="patch_level_scale">
+                <property name="adjustment">0 0 0 0 10 0</property>
+                <property name="digits">0</property>
               </widget>
               <packing>
+                <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="label1">
-                <property name="xalign">0,000000</property>
-                <property name="yalign">0,000000</property>
+              <widget class="GtkLabel" id="label3">
+                <property name="xalign">0</property>
+                <property name="yalign">0</property>
                 <property name="xpad">5</property>
                 <property name="ypad">5</property>
-                <property name="label">File/Directory to patch:</property>
+                <property name="label">Patch level:</property>
               </widget>
+              <packing>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+              </packing>
             </child>
             <child>
               <widget class="GtkLabel" id="label2">
-                <property name="xalign">0,000000</property>
-                <property name="yalign">0,000000</property>
+                <property name="xalign">0</property>
+                <property name="yalign">0</property>
                 <property name="xpad">5</property>
                 <property name="ypad">5</property>
                 <property name="label">Patch file:</property>
@@ -70,28 +64,35 @@
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="label3">
-                <property name="xalign">0,000000</property>
-                <property name="yalign">0,000000</property>
+              <widget class="GtkLabel" id="label1">
+                <property name="xalign">0</property>
+                <property name="yalign">0</property>
                 <property name="xpad">5</property>
                 <property name="ypad">5</property>
-                <property name="label">Patch level:</property>
+                <property name="label">File/Directory to patch:</property>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="output">
+                <property name="visible">True</property>
               </widget>
               <packing>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkHScale" id="patch_level_scale">
-                <property name="adjustment">1,000000 0,000000 10,000000 1,000000 0,000000 0,000000</property>
-                <property name="digits">0</property>
+              <widget class="GtkCheckButton" id="dryrun">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Dry run</property>
+                <property name="response_id">0</property>
+                <property name="draw_indicator">True</property>
               </widget>
               <packing>
-                <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
               </packing>
             </child>
           </widget>
@@ -117,48 +118,11 @@
               <widget class="GtkButton" id="patch_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <child>
-                  <widget class="GtkAlignment" id="alignment2">
-                    <property name="visible">True</property>
-                    <property name="xalign">0,000000</property>
-                    <property name="yalign">0,000000</property>
-                    <property name="xscale">0,000000</property>
-                    <property name="yscale">0,000000</property>
-                    <child>
-                      <widget class="GtkHBox" id="hbox2">
-                        <property name="visible">True</property>
-                        <property name="spacing">2</property>
-                        <child>
-                          <widget class="GtkImage" id="image2">
-                            <property name="visible">True</property>
-                            <property name="xalign">0,000000</property>
-                            <property name="yalign">0,000000</property>
-                            <property name="stock">gtk-apply</property>
-                          </widget>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkLabel" id="label5">
-                            <property name="visible">True</property>
-                            <property name="xalign">0,000000</property>
-                            <property name="yalign">0,000000</property>
-                            <property name="label" translatable="yes">Patch</property>
-                            <property name="use_underline">True</property>
-                          </widget>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
+                <property name="receives_default">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="label" translatable="yes">gtk-apply</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
               </widget>
               <packing>
                 <property name="position">1</property>

Modified: trunk/plugins/profiler/gprof-call-graph-block-entry.c
==============================================================================
--- trunk/plugins/profiler/gprof-call-graph-block-entry.c	(original)
+++ trunk/plugins/profiler/gprof-call-graph-block-entry.c	Thu Jan 31 18:58:37 2008
@@ -94,9 +94,9 @@
 	
 	entry = g_object_new (GPROF_CALL_GRAPH_BLOCK_ENTRY_TYPE, NULL);
 	
-	entry->priv->time_perc = atof (fields[0]);
-	entry->priv->self_sec = atof (fields[1]);
-	entry->priv->child_sec = atof (fields[2]);
+	entry->priv->time_perc = g_ascii_strtod (fields[0], NULL);
+	entry->priv->self_sec = g_ascii_strtod (fields[1], NULL);
+	entry->priv->child_sec = g_ascii_strtod (fields[2], NULL);
 	entry->priv->calls = g_strdup (fields[3]);
 	entry->priv->name = g_strdup (fields[4]);
 
@@ -111,8 +111,8 @@
 	entry = g_object_new (GPROF_CALL_GRAPH_BLOCK_ENTRY_TYPE, NULL);
 	
 	entry->priv->time_perc = 0.0f;
-	entry->priv->self_sec = atof (fields[0]);
-	entry->priv->child_sec = atof (fields[1]);
+	entry->priv->self_sec = g_ascii_strtod (fields[0], NULL);
+	entry->priv->child_sec = g_ascii_strtod (fields[1], NULL);
 	entry->priv->calls = g_strdup (fields[2]);
 	entry->priv->name = g_strdup (fields[3]);
 

Modified: trunk/plugins/profiler/gprof-flat-profile-entry.c
==============================================================================
--- trunk/plugins/profiler/gprof-flat-profile-entry.c	(original)
+++ trunk/plugins/profiler/gprof-flat-profile-entry.c	Thu Jan 31 18:58:37 2008
@@ -95,12 +95,12 @@
 	
 	entry = g_object_new (GPROF_FLAT_PROFILE_ENTRY_TYPE, NULL);
 	
-	entry->priv->time_perc = atof (fields[0]);
-	entry->priv->cum_sec = atof (fields[1]);
-	entry->priv->self_sec = atof (fields[2]);
+	entry->priv->time_perc = g_ascii_strtod (fields[0], NULL);
+	entry->priv->cum_sec = g_ascii_strtod (fields[1], NULL);
+	entry->priv->self_sec = g_ascii_strtod (fields[2], NULL);
 	entry->priv->calls = (unsigned) atoi (fields[3]);
-	entry->priv->avg_ms = atof (fields [4]);
-	entry->priv->total_ms = atof (fields[5]);
+	entry->priv->avg_ms = g_ascii_strtod (fields[4], NULL);
+	entry->priv->total_ms = g_ascii_strtod (fields[5], NULL);
 	entry->priv->name = g_strdup (fields[6]);
 
 	return entry;	



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]