Mercurial > pidgin
comparison src/protocols/toc/toc.c @ 5959:0a2a32b1917c
[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 | fccc33d4b8fa |
| children | 5fb6bd688a5b |
comparison
equal
deleted
inserted
replaced
| 5958:b432fa240263 | 5959:0a2a32b1917c |
|---|---|
| 1644 struct file_transfer *ft; | 1644 struct file_transfer *ft; |
| 1645 const char *dirname = gtk_file_selection_get_filename(GTK_FILE_SELECTION(old_ft->window)); | 1645 const char *dirname = gtk_file_selection_get_filename(GTK_FILE_SELECTION(old_ft->window)); |
| 1646 GaimAccount *account; | 1646 GaimAccount *account; |
| 1647 char buf[BUF_LEN * 2]; | 1647 char buf[BUF_LEN * 2]; |
| 1648 | 1648 |
| 1649 if (file_is_dir(dirname, old_ft->window)) | 1649 if (file_is_dir(dirname, GTK_FILE_SELECTION(old_ft->window))) |
| 1650 return; | 1650 return; |
| 1651 ft = g_new0(struct file_transfer, 1); | 1651 ft = g_new0(struct file_transfer, 1); |
| 1652 if (old_ft->files == 1) | 1652 if (old_ft->files == 1) |
| 1653 ft->filename = g_strdup(dirname); | 1653 ft->filename = g_strdup(dirname); |
| 1654 else | 1654 else |
| 1843 struct file_transfer *ft; | 1843 struct file_transfer *ft; |
| 1844 const char *dirname = gtk_file_selection_get_filename(GTK_FILE_SELECTION(old_ft->window)); | 1844 const char *dirname = gtk_file_selection_get_filename(GTK_FILE_SELECTION(old_ft->window)); |
| 1845 GaimAccount *account; | 1845 GaimAccount *account; |
| 1846 char *buf, buf2[BUF_LEN * 2]; | 1846 char *buf, buf2[BUF_LEN * 2]; |
| 1847 | 1847 |
| 1848 if (file_is_dir(dirname, old_ft->window)) | 1848 if (file_is_dir(dirname, GTK_FILE_SELECTION(old_ft->window))) |
| 1849 return; | 1849 return; |
| 1850 ft = g_new0(struct file_transfer, 1); | 1850 ft = g_new0(struct file_transfer, 1); |
| 1851 ft->filename = g_strdup(dirname); | 1851 ft->filename = g_strdup(dirname); |
| 1852 ft->file = fopen(ft->filename, "r"); | 1852 ft->file = fopen(ft->filename, "r"); |
| 1853 if (!ft->file) { | 1853 if (!ft->file) { |
