aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@gmail.com>2009-11-16 16:27:50 +0800
committerXavier Claessens <xclaesse@gmail.com>2009-11-25 01:29:44 +0800
commit212ea18a107e8ddfda82b3b754a1df2b7db9735f (patch)
tree196cc0639f067e39eee28e5c733b6acf7ef0492d
parente83c0814113515cdd5a3dc511f7e29cbe51651e8 (diff)
downloadgsoc2013-empathy-212ea18a107e8ddfda82b3b754a1df2b7db9735f.tar
gsoc2013-empathy-212ea18a107e8ddfda82b3b754a1df2b7db9735f.tar.gz
gsoc2013-empathy-212ea18a107e8ddfda82b3b754a1df2b7db9735f.tar.bz2
gsoc2013-empathy-212ea18a107e8ddfda82b3b754a1df2b7db9735f.tar.lz
gsoc2013-empathy-212ea18a107e8ddfda82b3b754a1df2b7db9735f.tar.xz
gsoc2013-empathy-212ea18a107e8ddfda82b3b754a1df2b7db9735f.tar.zst
gsoc2013-empathy-212ea18a107e8ddfda82b3b754a1df2b7db9735f.zip
start and end positions in EmpathySmileyHit struct can't be negative. Change them to guint.
-rw-r--r--libempathy-gtk/empathy-chat-text-view.c2
-rw-r--r--libempathy-gtk/empathy-smiley-manager.h4
-rw-r--r--libempathy-gtk/empathy-theme-adium.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/libempathy-gtk/empathy-chat-text-view.c b/libempathy-gtk/empathy-chat-text-view.c
index aa8676bfd..6dd8b3094 100644
--- 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 f15dbc468..1d6eaac54 100644
--- 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 5aae85c4a..78a218ad6 100644
--- 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;