Sat, 21 Aug 2004 15:05:45 +0000
[gaim-migrate @ 10669]
On Fri, 2004-08-20 at 23:57, Tim Ringenbach wrote:
> > relative buddy icon paths instead of absolute ones from nosnilmot. this
> > should save some headaches migrating a ~/.gaim around
> I think you broke something here. On start up I notice all buddy icons
> are fetched again, and they only show up in my buddy list, never my
> conversation window.
I did break something. I think the logic of "if the old file doesn't
exist, then delete the new one instead" when removing old icons isn't
exactly what I meant to do.
You were also correct to point out that prpls might use them directly -
oscar does.
Patch attached to fix both cases.
Regards,
Stu.
committer: Luke Schierer <lschiere@pidgin.im>
| 8317 | 1 | /* |
| 2 | * GtkIMHtmlToolbar | |
| 3 | * | |
| 4 | * Gaim is the legal property of its developers, whose names are too numerous | |
| 5 | * to list here. Please refer to the COPYRIGHT file distributed with this | |
| 6 | * source distribution. | |
| 7 | * | |
| 8 | * This program is free software; you can redistribute it and/or modify | |
| 9 | * under the terms of the GNU General Public License as published by | |
| 10 | * the Free Software Foundation; either version 2 of the License, or | |
| 11 | * (at your option) any later version. | |
| 12 | * | |
| 13 | * This program is distributed in the hope that it will be useful, | |
| 14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 16 | * GNU General Public License for more details. | |
| 17 | * | |
| 18 | * You should have received a copy of the GNU General Public License | |
| 19 | * along with this program; if not, write to the Free Software | |
| 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
| 21 | * | |
| 22 | */ | |
|
9713
bb37562302a1
[gaim-migrate @ 10574]
Mark Doliner <markdoliner@pidgin.im>
parents:
8427
diff
changeset
|
23 | #ifndef _GAIM_GTKIMHTMLTOOLBAR_H_ |
|
bb37562302a1
[gaim-migrate @ 10574]
Mark Doliner <markdoliner@pidgin.im>
parents:
8427
diff
changeset
|
24 | #define _GAIM_GTKIMHTMLTOOLBAR_H_ |
| 8317 | 25 | |
| 26 | #include <gtk/gtkvbox.h> | |
| 27 | #include "gtkimhtml.h" | |
| 28 | ||
| 29 | #ifdef __cplusplus | |
| 30 | extern "C" { | |
| 31 | #endif | |
| 32 | ||
| 33 | #define GTK_TYPE_IMHTMLTOOLBAR (gtk_imhtmltoolbar_get_type ()) | |
| 34 | #define GTK_IMHTMLTOOLBAR(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_IMHTMLTOOLBAR, GtkIMHtmlToolbar)) | |
| 35 | #define GTK_IMHTMLTOOLBAR_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_IMHTMLTOOLBAR, GtkIMHtmlToolbarClass)) | |
| 36 | #define GTK_IS_IMHTMLTOOLBAR(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_IMHTMLTOOLBAR)) | |
| 37 | #define GTK_IS_IMHTMLTOOLBAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IMHTMLTOOLBAR)) | |
| 38 | ||
| 39 | typedef struct _GtkIMHtmlToolbar GtkIMHtmlToolbar; | |
| 40 | typedef struct _GtkIMHtmlToolbarClass GtkIMHtmlToolbarClass; | |
| 41 | ||
| 42 | struct _GtkIMHtmlToolbar { | |
| 43 | GtkVBox box; | |
| 44 | ||
| 45 | GtkWidget *imhtml; | |
| 46 | ||
| 47 | GtkTooltips *tooltips; | |
|
8319
6c18762beceb
[gaim-migrate @ 9043]
Christian Hammond <chipx86@chipx86.com>
parents:
8317
diff
changeset
|
48 | |
| 8317 | 49 | GtkWidget *bold; |
| 50 | GtkWidget *italic; | |
| 51 | GtkWidget *underline; | |
|
8319
6c18762beceb
[gaim-migrate @ 9043]
Christian Hammond <chipx86@chipx86.com>
parents:
8317
diff
changeset
|
52 | |
| 8317 | 53 | GtkWidget *larger_size; |
| 54 | GtkWidget *normal_size; | |
| 55 | GtkWidget *smaller_size; | |
| 56 | ||
| 57 | GtkWidget *font; | |
| 58 | GtkWidget *fgcolor; | |
| 59 | GtkWidget *bgcolor; | |
| 60 | ||
| 61 | GtkWidget *image; | |
| 62 | GtkWidget *link; | |
| 63 | GtkWidget *smiley; | |
| 64 | GtkWidget *log; | |
| 65 | ||
| 66 | GtkWidget *font_dialog; | |
| 67 | GtkWidget *fgcolor_dialog; | |
| 68 | GtkWidget *bgcolor_dialog; | |
| 69 | GtkWidget *link_dialog; | |
| 70 | GtkWidget *smiley_dialog; | |
| 71 | GtkWidget *image_dialog; | |
| 8427 | 72 | |
| 73 | char *sml; | |
| 8317 | 74 | }; |
| 75 | ||
| 76 | struct _GtkIMHtmlToolbarClass { | |
| 77 | GtkVBoxClass parent_class; | |
| 78 | ||
| 79 | }; | |
| 80 | ||
|
8319
6c18762beceb
[gaim-migrate @ 9043]
Christian Hammond <chipx86@chipx86.com>
parents:
8317
diff
changeset
|
81 | GType gtk_imhtmltoolbar_get_type (void); |
| 8317 | 82 | GtkWidget* gtk_imhtmltoolbar_new (void); |
| 83 | ||
| 84 | void gtk_imhtmltoolbar_attach (GtkIMHtmlToolbar *toolbar, GtkWidget *imhtml); | |
| 8427 | 85 | void gtk_imhtmltoolbar_associate_smileys (GtkIMHtmlToolbar *toolbar, const char *proto_id); |
| 8317 | 86 | |
| 87 | ||
| 88 | #ifdef __cplusplus | |
| 89 | } | |
| 90 | #endif | |
| 91 | ||
|
9713
bb37562302a1
[gaim-migrate @ 10574]
Mark Doliner <markdoliner@pidgin.im>
parents:
8427
diff
changeset
|
92 | #endif /* _GAIM_GTKIMHTMLTOOLBAR_H_ */ |