Mercurial > pidgin.yaz
comparison pidgin/gtkutils.c @ 21778:e8e9a53b7694
merge of '93a8de710501e9a772b3fb12ab3db6682a41b3d6'
and 'ec67b1544528adb30f7d2edac30b22912b2da19b'
| author | Etan Reisner <pidgin@unreliablesource.net> |
|---|---|
| date | Wed, 05 Dec 2007 00:03:11 +0000 |
| parents | 14afe5a92fc2 5b0d9e08992d |
| children | f23c41e65f63 a3f0c30eb0bf e13759a83714 |
comparison
equal
deleted
inserted
replaced
| 21777:306ee626481d | 21778:e8e9a53b7694 |
|---|---|
| 2449 "clicked", | 2449 "clicked", |
| 2450 G_CALLBACK(icon_filesel_delete_cb), dialog); | 2450 G_CALLBACK(icon_filesel_delete_cb), dialog); |
| 2451 g_signal_connect(G_OBJECT(dialog->icon_filesel), "destroy", | 2451 g_signal_connect(G_OBJECT(dialog->icon_filesel), "destroy", |
| 2452 G_CALLBACK(icon_filesel_delete_cb), dialog); | 2452 G_CALLBACK(icon_filesel_delete_cb), dialog); |
| 2453 #endif /* FILECHOOSER */ | 2453 #endif /* FILECHOOSER */ |
| 2454 return dialog->icon_filesel; | 2454 |
| 2455 #ifdef _WIN32 | |
| 2456 g_signal_connect(G_OBJECT(dialog->icon_filesel), "show", | |
| 2457 G_CALLBACK(winpidgin_ensure_onscreen), dialog->icon_filesel); | |
| 2458 #endif | |
| 2459 | |
| 2460 return dialog->icon_filesel; | |
| 2455 } | 2461 } |
| 2456 | 2462 |
| 2457 | 2463 |
| 2458 #if GTK_CHECK_VERSION(2,2,0) | 2464 #if GTK_CHECK_VERSION(2,2,0) |
| 2459 static gboolean | 2465 static gboolean |