Mercurial > pidgin.yaz
comparison src/gtkimhtmltoolbar.c @ 10504:1a97d5e88d12
[gaim-migrate @ 11796]
Lots of things here:
- Several memory leak fixes
- A few invalid memory access fixes
- Fix a yahoo crash going idle when away
- Fix Add user in chats to actually fill in the screenname
- Add gaim_account_{get,set}_enabled to perl
- Fix command priorities (fixes /me in IRC)
- Fix MSN notification server transfer to be quiet about it
- Fix MSN blist sync if user has insane friendly name
- Make the docklet less crash-happy if it fails to embed in 3 seconds
- Only probe for native plugins with the correct file extension
- 1 typo fix :)
... and quite possibly something else I forgot.
committer: Tailor Script <tailor@pidgin.im>
author | Stu Tomlinson <stu@nosnilmot.com> |
---|---|
date | Tue, 11 Jan 2005 17:25:06 +0000 |
parents | ec140184437b |
children | c4cb90065e1d |
comparison
equal
deleted
inserted
replaced
10503:776586d647e3 | 10504:1a97d5e88d12 |
---|---|
168 } | 168 } |
169 | 169 |
170 static void | 170 static void |
171 toggle_font(GtkWidget *font, GtkIMHtmlToolbar *toolbar) | 171 toggle_font(GtkWidget *font, GtkIMHtmlToolbar *toolbar) |
172 { | 172 { |
173 const char *fontname; | 173 char *fontname; |
174 | 174 |
175 g_return_if_fail(toolbar); | 175 g_return_if_fail(toolbar); |
176 | 176 |
177 fontname = gtk_imhtml_get_current_fontface(GTK_IMHTML(toolbar->imhtml)); | 177 fontname = gtk_imhtml_get_current_fontface(GTK_IMHTML(toolbar->imhtml)); |
178 | 178 |
184 if(fontname) { | 184 if(fontname) { |
185 char fonttif[128]; | 185 char fonttif[128]; |
186 g_snprintf(fonttif, sizeof(fonttif), "%s 12", fontname); | 186 g_snprintf(fonttif, sizeof(fonttif), "%s 12", fontname); |
187 gtk_font_selection_dialog_set_font_name(GTK_FONT_SELECTION_DIALOG(toolbar->font_dialog), | 187 gtk_font_selection_dialog_set_font_name(GTK_FONT_SELECTION_DIALOG(toolbar->font_dialog), |
188 fonttif); | 188 fonttif); |
189 g_free(fontname); | |
189 } else { | 190 } else { |
190 gtk_font_selection_dialog_set_font_name(GTK_FONT_SELECTION_DIALOG(toolbar->font_dialog), | 191 gtk_font_selection_dialog_set_font_name(GTK_FONT_SELECTION_DIALOG(toolbar->font_dialog), |
191 DEFAULT_FONT_FACE); | 192 DEFAULT_FONT_FACE); |
192 } | 193 } |
193 | 194 |
249 toggle_fg_color(GtkWidget *color, GtkIMHtmlToolbar *toolbar) | 250 toggle_fg_color(GtkWidget *color, GtkIMHtmlToolbar *toolbar) |
250 { | 251 { |
251 if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(color))) { | 252 if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(color))) { |
252 GtkWidget *colorsel; | 253 GtkWidget *colorsel; |
253 GdkColor fgcolor; | 254 GdkColor fgcolor; |
254 const char *color = gtk_imhtml_get_current_forecolor(GTK_IMHTML(toolbar->imhtml)); | 255 char *color = gtk_imhtml_get_current_forecolor(GTK_IMHTML(toolbar->imhtml)); |
255 | 256 |
256 if (!toolbar->fgcolor_dialog) { | 257 if (!toolbar->fgcolor_dialog) { |
257 | 258 |
258 toolbar->fgcolor_dialog = gtk_color_selection_dialog_new(_("Select Text Color")); | 259 toolbar->fgcolor_dialog = gtk_color_selection_dialog_new(_("Select Text Color")); |
259 colorsel = GTK_COLOR_SELECTION_DIALOG(toolbar->fgcolor_dialog)->colorsel; | 260 colorsel = GTK_COLOR_SELECTION_DIALOG(toolbar->fgcolor_dialog)->colorsel; |
260 if (color) { | 261 if (color) { |
261 gdk_color_parse(color, &fgcolor); | 262 gdk_color_parse(color, &fgcolor); |
262 gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(colorsel), &fgcolor); | 263 gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(colorsel), &fgcolor); |
264 g_free(color); | |
263 } | 265 } |
264 | 266 |
265 g_object_set_data(G_OBJECT(colorsel), "gaim_toolbar", toolbar); | 267 g_object_set_data(G_OBJECT(colorsel), "gaim_toolbar", toolbar); |
266 | 268 |
267 g_signal_connect(G_OBJECT(toolbar->fgcolor_dialog), "delete_event", | 269 g_signal_connect(G_OBJECT(toolbar->fgcolor_dialog), "delete_event", |
323 toggle_bg_color(GtkWidget *color, GtkIMHtmlToolbar *toolbar) | 325 toggle_bg_color(GtkWidget *color, GtkIMHtmlToolbar *toolbar) |
324 { | 326 { |
325 if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(color))) { | 327 if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(color))) { |
326 GtkWidget *colorsel; | 328 GtkWidget *colorsel; |
327 GdkColor bgcolor; | 329 GdkColor bgcolor; |
328 const char *color = gtk_imhtml_get_current_backcolor(GTK_IMHTML(toolbar->imhtml)); | 330 char *color = gtk_imhtml_get_current_backcolor(GTK_IMHTML(toolbar->imhtml)); |
329 | 331 |
330 if (!toolbar->bgcolor_dialog) { | 332 if (!toolbar->bgcolor_dialog) { |
331 | 333 |
332 toolbar->bgcolor_dialog = gtk_color_selection_dialog_new(_("Select Background Color")); | 334 toolbar->bgcolor_dialog = gtk_color_selection_dialog_new(_("Select Background Color")); |
333 colorsel = GTK_COLOR_SELECTION_DIALOG(toolbar->bgcolor_dialog)->colorsel; | 335 colorsel = GTK_COLOR_SELECTION_DIALOG(toolbar->bgcolor_dialog)->colorsel; |
334 if (color) { | 336 if (color) { |
335 gdk_color_parse(color, &bgcolor); | 337 gdk_color_parse(color, &bgcolor); |
336 gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(colorsel), &bgcolor); | 338 gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(colorsel), &bgcolor); |
339 g_free(color); | |
337 } | 340 } |
338 | 341 |
339 g_object_set_data(G_OBJECT(colorsel), "gaim_toolbar", toolbar); | 342 g_object_set_data(G_OBJECT(colorsel), "gaim_toolbar", toolbar); |
340 | 343 |
341 g_signal_connect(G_OBJECT(toolbar->bgcolor_dialog), "delete_event", | 344 g_signal_connect(G_OBJECT(toolbar->bgcolor_dialog), "delete_event", |