Mercurial > pidgin.yaz

comparison src/gtkconv.c @ 5959:0a2a32b1917c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 6405] Some minor UI fixes from yours truely: -Closing a conversation that has a "select image to insert" dialog open now also closes and frees the "select image to insert" dialog. -The buddy icon selection dialog now lets you type, eg "~/.gaim/icons" and hit enter without it thinking you've selected "~/.gaim/icons" as your buddy icon. It will instead change the icon selection dialog to that directory. -Same for the "select file to send" dialog. -Same for the right-click-on-an-icon "save icon" dialog. -Same for the right-click-on-an-IM-image "save image" dialog. -Same for buddy pounce "select sound" and "select program" dialogs. I think there is a small leak here, but I don't have time to figure it out. Someone should memprof this. I think it's gtkpounce.c line 140. -Same for toc's "select file to send" dialog. This needs to change-- toc has gtk code in it. -Made file_is_dir() accept a GtkFileSelection rather than a GtkWidget (there is no reason it would need to accept anything other than a GtkFileSelection) -Some minor pounce dialog memleak fixes, I think. The hash table wasn't getting freed on cancel. Line 4960 of gtkconv.c might be leaking somehow. Someone should look into that. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Thu, 26 Jun 2003 02:01:56 +0000
parents 91ee71a394be
children 5fb6bd688a5b
comparison
equal deleted inserted replaced
5958:b432fa240263 5959:0a2a32b1917c
147 const char *filename; 147 const char *filename;
148 FILE *fp; 148 FILE *fp;
149 149
150 filename = gtk_file_selection_get_filename(GTK_FILE_SELECTION(wid)); 150 filename = gtk_file_selection_get_filename(GTK_FILE_SELECTION(wid));
151 151
152 if (file_is_dir(filename, wid)) 152 if (file_is_dir(filename, GTK_FILE_SELECTION(wid)))
153 return; 153 return;
154 154
155 if (!((gaim_conversation_get_type(c) != GAIM_CONV_CHAT && 155 if (!((gaim_conversation_get_type(c) != GAIM_CONV_CHAT &&
156 g_list_find(gaim_get_ims(), c)) || 156 g_list_find(gaim_get_ims(), c)) ||
157 (gaim_conversation_get_type(c) == GAIM_CONV_CHAT && 157 (gaim_conversation_get_type(c) == GAIM_CONV_CHAT &&
187 gtkconv = GAIM_GTK_CONVERSATION(conv); 187 gtkconv = GAIM_GTK_CONVERSATION(conv);
188 im = GAIM_IM(conv); 188 im = GAIM_IM(conv);
189 name = gtk_file_selection_get_filename(GTK_FILE_SELECTION(wid)); 189 name = gtk_file_selection_get_filename(GTK_FILE_SELECTION(wid));
190 id = g_slist_length(im->images) + 1; 190 id = g_slist_length(im->images) + 1;
191 191
192 if (file_is_dir(name, wid)) 192 if (file_is_dir(name, GTK_FILE_SELECTION(wid)))
193 return; 193 return;
194 194
195 gtk_widget_destroy(wid); 195 gtk_widget_destroy(wid);
196 196
197 if (!name) 197 if (!name)
4131 if (gtkconv->dialogs.bg_color != NULL) 4131 if (gtkconv->dialogs.bg_color != NULL)
4132 gtk_widget_destroy(gtkconv->dialogs.bg_color); 4132 gtk_widget_destroy(gtkconv->dialogs.bg_color);
4133 4133
4134 if (gtkconv->dialogs.font != NULL) 4134 if (gtkconv->dialogs.font != NULL)
4135 gtk_widget_destroy(gtkconv->dialogs.font); 4135 gtk_widget_destroy(gtkconv->dialogs.font);
4136
4137 if (gtkconv->dialogs.image != NULL)
4138 gtk_widget_destroy(gtkconv->dialogs.image);
4136 4139
4137 if (gtkconv->dialogs.smiley != NULL) 4140 if (gtkconv->dialogs.smiley != NULL)
4138 gtk_widget_destroy(gtkconv->dialogs.smiley); 4141 gtk_widget_destroy(gtkconv->dialogs.smiley);
4139 4142
4140 if (gtkconv->dialogs.link != NULL) 4143 if (gtkconv->dialogs.link != NULL)