[geany/geany-plugins] baf202: scope - small improvements

[Dimitar Zhekov]

Branch:      refs/heads/master
Author:      Dimitar Zhekov <dimitar.zhekov at gmail.com>
Committer:   Dimitar Zhekov <dimitar.zhekov at gmail.com>
Date:        Thu, 25 Apr 2013 18:07:50 UTC
Commit:      baf202c8c70ff013a76f61c5fed1049a12f4179a
             https://github.com/geany/geany-plugins/commit/baf202c8c70ff013a76f61c5fed1049a12f4179a

Log Message:
-----------
scope - small improvements


Modified Paths:
--------------
    scope/ChangeLog
    scope/src/break.c
    scope/src/debug.c
    scope/src/utils.c

Modified: scope/ChangeLog
9 files changed, 9 insertions(+), 0 deletions(-)
===================================================================
@@ -1,3 +1,12 @@
+2013-04-25  Dimitar Zhekov  <dimitar.zhekov at gmail.com>
+
+ * src/break.c, src/utils.c:
+   Small improvements.
+ * src/store/scptreestore.c:
+   Added i18n for gtk+ >= 2.18.
+ * src/store/scptreestore.html:
+   ScpTreeStore documentation fixes.
+
 2013-04-04  Dimitar Zhekov  <dimitar.zhekov at gmail.com>
 
  * data/scope.glade, src/Makefile.am, src/break.c, src/common.h,


Modified: scope/src/break.c
16 files changed, 6 insertions(+), 10 deletions(-)
===================================================================
@@ -57,17 +57,12 @@ static gint break_id_compare(ScpTreeStore *store, GtkTreeIter *a, GtkTreeIter *b
 	scp_tree_store_get(store, b, BREAK_ID, &s2, -1);
 	result = utils_atoi0(s1) - utils_atoi0(s2);
 
-	if (!result && s1 && s2)
-	{
-		const char *p1, *p2;
-
-		for (p1 = s1; isdigit(*p1); p1++);
-		for (p2 = s2; isdigit(*p2); p2++);
+	if (result || !s1 || !s2)
+		return result;
 
-		result = atoi(p1 + (*p1 == '.')) - atoi(p2 + (*p2 == '.'));
-	}
-
-	return result;
+	while (isdigit(*s1)) s1++;
+	while (isdigit(*s2)) s2++;
+	return atoi(s1 + (*s1 == '.')) - atoi(s2 + (*s2 == '.'));
 }
 
 static gint break_location_compare(ScpTreeStore *store, GtkTreeIter *a, GtkTreeIter *b,
@@ -1099,6 +1094,7 @@ static void on_break_selection_changed(GtkTreeSelection *selection,
 
 		scp_tree_store_get(store, &iter, BREAK_ID, &id, -1);
 		editable = !id || !strchr(id, '.');
+
 		for (index = 0; index < EDITCOLS; index++)
 			g_object_set(block_cells[index], "editable", editable, NULL);
 	}


Modified: scope/src/debug.c
1 files changed, 0 insertions(+), 1 deletions(-)
===================================================================
@@ -741,7 +741,6 @@ char *debug_send_evaluate(char token, gint scid, const gchar *expr)
 
 	debug_send_format(F, "0%c%d-data-evaluate-expression \"%s\"", token, scid, string->str);
 	g_string_free(string, TRUE);
-
 	return locale;
 }
 


Modified: scope/src/utils.c
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -269,7 +269,7 @@ void store_save(ScpTreeStore *store, GKeyFile *config, const gchar *prefix,
 
 gint store_gint_compare(ScpTreeStore *store, GtkTreeIter *a, GtkTreeIter *b, gpointer gdata)
 {
-	gchar *s1, *s2;
+	const gchar *s1, *s2;
 
 	scp_tree_store_get(store, a, GPOINTER_TO_INT(gdata), &s1, -1);
 	scp_tree_store_get(store, b, GPOINTER_TO_INT(gdata), &s2, -1);



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).