start and end positions in EmpathySmileyHit struct can't be negative. Change them...

diff --git a/libempathy-gtk/empathy-chat-text-view.c b/libempathy-gtk/empathy-chat-text-view.c
index aa8676bfd6155f046e3d79d8ce69bd75be17d532..6dd8b3094c9a1efaf2d09506822f9858e9a52e75 100644 (file)
--- a/libempathy-gtk/empathy-chat-text-view.c
+++ b/libempathy-gtk/empathy-chat-text-view.c
@@ -1263,7 +1263,7 @@ chat_text_view_insert_text_with_emoticons (EmpathyChatTextView *view,
        EmpathyChatTextViewPriv *priv = GET_PRIV (view);
        gboolean                 use_smileys = FALSE;
        GSList                  *hits, *l;
-       gint                     last = 0;
+       guint                    last = 0;
 
        empathy_conf_get_bool (empathy_conf_get (),
                               EMPATHY_PREFS_CHAT_SHOW_SMILEYS,

diff --git a/libempathy-gtk/empathy-smiley-manager.h b/libempathy-gtk/empathy-smiley-manager.h
index f15dbc4684eaae0a033cbf1e8693ffc40276f122..1d6eaac545819aad4d5094a36509eaed41f33444 100644 (file)
--- a/libempathy-gtk/empathy-smiley-manager.h
+++ b/libempathy-gtk/empathy-smiley-manager.h
@@ -55,8 +55,8 @@ typedef struct {
 typedef struct {
        GdkPixbuf   *pixbuf; /* Pixbuf of the smiley */
        const gchar *path;   /* Filename of the smiley image */
-       gint         start;  /* text[start:end] should be replaced by pixbuf */
-       gint         end;
+       guint        start;  /* text[start:end] should be replaced by pixbuf */
+       guint        end;
 } EmpathySmileyHit;
 
 typedef void (*EmpathySmileyMenuFunc) (EmpathySmileyManager *manager,

diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index 5aae85c4a97d828cfffe171c360609d12811769c..78a218ad60f3e6ea4fee1b8223351fb0bfd9ad0f 100644 (file)
--- a/libempathy-gtk/empathy-theme-adium.c
+++ b/libempathy-gtk/empathy-theme-adium.c
@@ -224,7 +224,7 @@ theme_adium_parser_smiley (GString *string,
                           gssize len,
                           gpointer user_data)
 {
-       gint last = 0;
+       guint last = 0;
 
        if (use_smileys) {
                EmpathySmileyManager *smiley_manager;