dia r4136 - in trunk: . app lib

[hans svn gnome org]

Author: hans
Date: Sun Nov  2 12:45:07 2008
New Revision: 4136
URL: http://svn.gnome.org/viewvc/dia?rev=4136&view=rev

Log:
2008-11-02  Hans Breuer  <hans breuer org>

	* app/find-and-replace.c : no C++ comment and not other warnings

	* lib/text.c : ignore singel carriage return, work around for 

	* lib/lib_dia. : removed (should never have been added)




Removed:
   trunk/lib/lib_dia.
Modified:
   trunk/ChangeLog
   trunk/app/find-and-replace.c
   trunk/lib/text.c

Modified: trunk/app/find-and-replace.c
==============================================================================
--- trunk/app/find-and-replace.c	(original)
+++ trunk/app/find-and-replace.c	Sun Nov  2 12:45:07 2008
@@ -177,7 +177,6 @@
       guint sub_num;
 
       for (sub_num = 0; sub_num < sub_props->len && !is_match; ++sub_num) {
-	const gchar *sub_prop_name;
 	Property *sub_prop = g_ptr_array_index (sub_props, sub_num);
 
         is_match = _match_prop (obj, sd, replacement, sub_prop);
@@ -257,7 +256,7 @@
       /* First time. */
       matched_plist = prop_list_from_single (prop);
     } else {
-      //FIXME: do we realy want a replace all here?
+      /* FIXME: do we realy want a replace all here? */
       /* Subsequent finds. */
       GPtrArray *append_plist;
       append_plist = prop_list_from_single (prop);
@@ -304,8 +303,9 @@
 }
 
 static void
-find_func (DiaObject *obj, gpointer user_data)
+find_func (gpointer data, gpointer user_data)
 {
+  DiaObject *obj = data;
   SearchData *sd = (SearchData *)user_data;
   
   if (!sd->found) {
@@ -355,7 +355,6 @@
   const gchar *search = gtk_entry_get_text (g_object_get_data (G_OBJECT (widget), "search-entry")); 
   const gchar *replace;
   DDisplay *ddisp = (DDisplay*)data;
-  GList *list;
   SearchData sd = { 0, };
   sd.diagram = ddisp->diagram;
   sd.flags =  gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON ( 

Modified: trunk/lib/text.c
==============================================================================
--- trunk/lib/text.c	(original)
+++ trunk/lib/text.c	Sun Nov  2 12:45:07 2008
@@ -918,6 +918,8 @@
         break;
       default:
         if (str || (strlen>0)) {
+          if (strlen == 1 && *str == '\r')
+            break; /* avoid putting junk into our string */
           return_val = TRUE;
           utf = str;
           for (utf = str; utf && *utf && strlen > 0 ;