1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
|
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkaccount.c,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- gaim/gaim/src/gtkaccount.c 2004/07/12 19:47:46 1.135
+++ gaim/gaim/src/gtkaccount.c 2004/07/18 14:57:55 1.136
@@ -158,6 +158,8 @@
static void add_account(AccountsWindow *dialog, GaimAccount *account);
static void set_account(GtkListStore *store, GtkTreeIter *iter,
GaimAccount *account);
+static char*
+convert_buddy_icon(GaimAccount *account, const char *path);
static char *
proto_name(const char *id)
@@ -281,13 +283,13 @@
if (dialog->icon_path)
g_free(dialog->icon_path);
- dialog->icon_path = g_strdup(filename);
- gtk_image_set_from_file(GTK_IMAGE(dialog->icon_entry), filename);
+ dialog->icon_path = convert_buddy_icon(dialog->account, filename);
+ gtk_image_set_from_file(GTK_IMAGE(dialog->icon_entry), dialog->icon_path);
gtk_widget_show(dialog->icon_entry);
gtk_widget_destroy(dialog->icon_filesel);
dialog->icon_filesel = NULL;
-}
+ }
static void
#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
@@ -473,8 +475,8 @@
*rtmp = '\0';
if (dialog->icon_path)
g_free(dialog->icon_path);
- dialog->icon_path = g_strdup(tmp);
- gtk_image_set_from_file(GTK_IMAGE(dialog->icon_entry), tmp);
+ dialog->icon_path = convert_buddy_icon(dialog->account, tmp);
+ gtk_image_set_from_file(GTK_IMAGE(dialog->icon_entry), dialog->icon_path);
gtk_widget_show(dialog->icon_entry);
g_free(tmp);
}
@@ -500,8 +502,8 @@
}
#endif
-static void
-convert_and_set_buddy_icon(GaimAccount *account, const char *path)
+static char*
+convert_buddy_icon(GaimAccount *account, const char *path)
{
#if GTK_CHECK_VERSION(2,2,0)
int width, height;
@@ -544,7 +546,7 @@
prpl_info->icon_spec.min_height <= height &&
prpl_info->icon_spec.max_height >= height))) { /* The icon is the correct size */
#endif
- gaim_account_set_buddy_icon(account, path);
+ return g_strdup(path);
#if GTK_CHECK_VERSION(2,2,0)
} else {
int i;
@@ -577,7 +579,7 @@
g_free(random);
gaim_debug_error("buddyicon", "Could not open icon for conversion: %s\n", error->message);
g_error_free(error);
- return;
+ return NULL;
}
for (i = 0; prpl_formats[i]; i++) {
gaim_debug_info("buddyicon", "Converting buddy icon to %s as %s\n", prpl_formats[i], filename);
@@ -585,7 +587,9 @@
break;
}
if (!error) {
- gaim_account_set_buddy_icon(account, filename);
+ g_free(random);
+ g_object_unref(G_OBJECT(pixbuf));
+ return filename;
} else {
gaim_debug_error("buddyicon", "Could not convert icon to usable format: %s\n", error->message);
g_error_free(error);
@@ -594,6 +598,7 @@
g_free(random);
g_object_unref(G_OBJECT(pixbuf));
}
+ return NULL;
#endif
}
@@ -1330,14 +1335,8 @@
/* Buddy Icon */
value = dialog->icon_path;
+ gaim_account_set_buddy_icon(dialog->account, value);
- if (dialog->prpl_info &&
- (dialog->prpl_info->icon_spec.format) &&
- value != NULL) {
- convert_and_set_buddy_icon(dialog->account, value);
- } else {
- gaim_account_set_buddy_icon(dialog->account, NULL);
- }
/* Remember Password */
gaim_account_set_remember_password(dialog->account,
gtk_toggle_button_get_active(
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -r1.308 -r1.309
--- gaim/gaim/src/protocols/msn/msn.c 2004/07/17 18:11:10 1.308
+++ gaim/gaim/src/protocols/msn/msn.c 2004/07/18 14:57:55 1.309
@@ -1661,7 +1661,7 @@
OPT_PROTO_MAIL_CHECK,
NULL, /* user_splits */
NULL, /* protocol_options */
- {"png", 0, 0, 0, 0, 0}, /* icon_spec */
+ {"png", 0, 0, 96, 96, GAIM_ICON_SCALE_SEND}, /* icon_spec */
msn_list_icon, /* list_icon */
msn_list_emblems, /* list_emblems */
msn_status_text, /* status_text */
|
GitWeb