Diff of /trunk/src/map.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 194 by harbaum, Tue Jul 7 19:31:45 2009 UTC revision 195 by harbaum, Wed Jul 8 08:51:02 2009 UTC
# Line 54  static void map_statusbar(map_t *map, ma Line 54  static void map_statusbar(map_t *map, ma
54    }    }
55    
56    gboolean collision = FALSE;    gboolean collision = FALSE;
   
 #if 0  
57    tag_t *tags = tag;    tag_t *tags = tag;
58      while(tag) {
59    if(id == ID_ILLEGAL)      if(!collision && info_tag_key_collision(tags, tag))
60      str = g_strdup_printf(_("Unknown item"));        collision = TRUE;
61    else {      tag = tag->next;
     str = g_strdup_printf("%s", item_str);  
   
     /* add some tags ... */  
     /*  
      *  Should we just try to present only the name or the ref (or the  
      *  alt_name, old_name, whatever) here?  Hurling a load of tags in the  
      *  user's face in some unpredictable, uninformative order isn't very  
      *  friendly.  
      *  
      *  Actually, a tag_short_desc() function would be useful in dialogs  
      *  and user messages too.  
      */  
     while(tag) {  
       if(!collision && info_tag_key_collision(tags, tag))  
         collision = TRUE;  
   
       /* we don't have much space, so ignore created_by tag */  
       if(!osm_is_creator_tag(tag)) {  
         char *old = str;  
         str = g_strdup_printf("%s, %s=%s", old, tag->key, tag->value);  
         g_free(old);  
       }  
       tag = tag->next;  
     }  
62    }    }
63  #else  
64    str = osm_object_string(&map_item->object);    str = osm_object_get_speaking_name(&map_item->object);
   str[0] = g_ascii_toupper(str[0]);  
 #endif  
   
65    statusbar_set(map->appdata, str, collision);    statusbar_set(map->appdata, str, collision);
66    g_free(str);    g_free(str);
67  }  }
Legend:
Removed from v.194  
changed lines
  Added in v.195