Mercurial > pidgin
comparison src/gtkconv.c @ 10812:d087e928ffd1
[gaim-migrate @ 12465]
" A variety of spacing normalization I've done as I've
navigated the source making other changes. The specific
changes should be uncontroversial. I'm submitting these to
shrink the deltas between my local tree and the CVS
source. If spacing changes are unwelcome as a general
rule, let me know." --rlaager
I said not to do this sort of patch often.
also a spelling fix.
committer: Tailor Script <tailor@pidgin.im>
author | Luke Schierer <lschiere@pidgin.im> |
---|---|
date | Mon, 11 Apr 2005 04:32:26 +0000 |
parents | 9a1ced2bc585 |
children | 8d52201620d0 |
comparison
equal
deleted
inserted
replaced
10811:dc59482c8d37 | 10812:d087e928ffd1 |
---|---|
79 {0, 23808, 29952, 21760}, /* Green Dark */ | 79 {0, 23808, 29952, 21760}, /* Green Dark */ |
80 {0, 17408, 22016, 12800}, /* Green Shadow */ | 80 {0, 17408, 22016, 12800}, /* Green Shadow */ |
81 {0, 57344, 46592, 44800}, /* Red Hilight */ | 81 {0, 57344, 46592, 44800}, /* Red Hilight */ |
82 {0, 49408, 26112, 23040}, /* Red Medium */ | 82 {0, 49408, 26112, 23040}, /* Red Medium */ |
83 {0, 34816, 17920, 12544}, /* Red Dark */ | 83 {0, 34816, 17920, 12544}, /* Red Dark */ |
84 {0, 49408, 14336, 8704}, /* Red Shadow */ | 84 {0, 49408, 14336, 8704}, /* Red Shadow */ |
85 {0, 34816, 32512, 41728}, /* Purple Medium */ | 85 {0, 34816, 32512, 41728}, /* Purple Medium */ |
86 {0, 25088, 23296, 33024}, /* Purple Dark */ | 86 {0, 25088, 23296, 33024}, /* Purple Dark */ |
87 {0, 18688, 16384, 26112}, /* Purple Shadow */ | 87 {0, 18688, 16384, 26112}, /* Purple Shadow */ |
88 {0, 40192, 47104, 53760}, /* Blue Hilight */ | 88 {0, 40192, 47104, 53760}, /* Blue Hilight */ |
89 {0, 29952, 36864, 44544}, /* Blue Medium */ | 89 {0, 29952, 36864, 44544}, /* Blue Medium */ |
90 {0, 57344, 49920, 40448}, /* Face Skin Medium */ | 90 {0, 57344, 49920, 40448}, /* Face Skin Medium */ |
91 {0, 45824, 37120, 26880}, /* Face skin Dark */ | 91 {0, 45824, 37120, 26880}, /* Face skin Dark */ |
92 {0, 33280, 26112, 18176}, /* Face Skin Shadow */ | 92 {0, 33280, 26112, 18176}, /* Face Skin Shadow */ |
93 {0, 57088, 16896, 7680}, /* Accent Red */ | 93 {0, 57088, 16896, 7680}, /* Accent Red */ |
94 {0, 39168, 0, 0}, /* Accent Red Dark */ | 94 {0, 39168, 0, 0}, /* Accent Red Dark */ |
95 {0, 60928, 54784, 32768}, /* Accent Yellow */ | 95 {0, 60928, 54784, 32768}, /* Accent Yellow */ |
96 {0, 17920, 40960, 17920}, /* Accent Green */ | 96 {0, 17920, 40960, 17920}, /* Accent Green */ |
97 {0, 9728, 50944, 9728} /* Accent Green Dark */ | 97 {0, 9728, 50944, 9728} /* Accent Green Dark */ |
98 }; | 98 }; |
99 | 99 |
100 #define NUM_NICK_COLORS (sizeof(nick_colors) / sizeof(*nick_colors)) | 100 #define NUM_NICK_COLORS (sizeof(nick_colors) / sizeof(*nick_colors)) |
101 | 101 |
102 typedef struct | 102 typedef struct |
4975 | 4975 |
4976 num_users = g_list_length(gaim_conv_chat_get_users(chat)); | 4976 num_users = g_list_length(gaim_conv_chat_get_users(chat)); |
4977 | 4977 |
4978 g_snprintf(tmp, sizeof(tmp), | 4978 g_snprintf(tmp, sizeof(tmp), |
4979 ngettext("%d person in room", "%d people in room", | 4979 ngettext("%d person in room", "%d people in room", |
4980 num_users), | 4980 num_users), num_users); |
4981 num_users); | |
4982 | 4981 |
4983 gtk_label_set_text(GTK_LABEL(gtkchat->count), tmp); | 4982 gtk_label_set_text(GTK_LABEL(gtkchat->count), tmp); |
4984 | 4983 |
4985 if (gtkconv->make_sound && new_arrival) | 4984 if (gtkconv->make_sound && new_arrival) |
4986 gaim_sound_play_event(GAIM_SOUND_CHAT_JOIN); | 4985 gaim_sound_play_event(GAIM_SOUND_CHAT_JOIN); |
5131 g_list_length(users); | 5130 g_list_length(users); |
5132 | 5131 |
5133 for (l = users; l != NULL; l = l->next) { | 5132 for (l = users; l != NULL; l = l->next) { |
5134 model = gtk_tree_view_get_model(GTK_TREE_VIEW(gtkchat->list)); | 5133 model = gtk_tree_view_get_model(GTK_TREE_VIEW(gtkchat->list)); |
5135 | 5134 |
5136 if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(model), | 5135 if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(model), &iter)) |
5137 &iter)) | |
5138 continue; | 5136 continue; |
5139 | 5137 |
5140 do { | 5138 do { |
5141 char *val; | 5139 char *val; |
5142 | 5140 |
5246 | 5244 |
5247 loader = gdk_pixbuf_loader_new(); | 5245 loader = gdk_pixbuf_loader_new(); |
5248 | 5246 |
5249 /* this is wrong, this file ought not call g_new on GtkIMHtmlSmiley */ | 5247 /* this is wrong, this file ought not call g_new on GtkIMHtmlSmiley */ |
5250 /* Let gtk_imhtml have a gtk_imhtml_smiley_new function, and let | 5248 /* Let gtk_imhtml have a gtk_imhtml_smiley_new function, and let |
5251 GtkIMHtmlSmiley by opque */ | 5249 GtkIMHtmlSmiley by opaque */ |
5252 smiley = g_new0(GtkIMHtmlSmiley, 1); | 5250 smiley = g_new0(GtkIMHtmlSmiley, 1); |
5253 smiley->file = NULL; | 5251 smiley->file = NULL; |
5254 smiley->smile = g_strdup(smile); | 5252 smiley->smile = g_strdup(smile); |
5255 smiley->loader = loader; | 5253 smiley->loader = loader; |
5256 | 5254 |