Mercurial > pidgin
changeset 21008:96dee745ce14
merge of '7793ae5b4dd75b3c2f62c2502dbd08c76dbe7b1c'
and 'be3e4adb905d9838ae215b0fcdbe7119654d2998'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Thu, 25 Oct 2007 01:59:58 +0000 |
| parents | f43d7aafe1f8 (diff) 697320a139e8 (current diff) |
| children | 77e0fa7c5bdd |
| files | pidgin/gtkconv.c |
| diffstat | 2 files changed, 13 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin.spec.in Thu Oct 25 01:57:28 2007 +0000 +++ b/pidgin.spec.in Thu Oct 25 01:59:58 2007 +0000 @@ -455,12 +455,16 @@ # libgnt %dir %{_includedir}/gnt %{_includedir}/gnt/*.h +%{_libdir}/pkgconfig/finch.pc %{_libdir}/pkgconfig/gnt.pc %{_libdir}/libgnt.so %endif %changelog +* Tue Oct 23 2007 Stu Tomlinson <stu@nosnilmot.com> +- Add finch.pc to finch-devel + * Mon Sep 17 2007 Stu Tomlinson <stu@nosnilmot.com> - Add version dependency on libpurple for pidgin - Support for OpenSuse lowercase package name for GConf2
--- a/pidgin/gtkconv.c Thu Oct 25 01:57:28 2007 +0000 +++ b/pidgin/gtkconv.c Thu Oct 25 01:59:58 2007 +0000 @@ -8828,6 +8828,9 @@ GtkPositionType pos; GtkWidget *testidea; GtkWidget *menubar; +#if GTK_CHECK_VERSION(2,6,0) + GdkModifierType state; +#endif win = g_malloc0(sizeof(PidginWindow)); @@ -8835,6 +8838,10 @@ /* Create the window. */ win->window = pidgin_create_window(NULL, 0, "conversation", TRUE); +#if GTK_CHECK_VERSION(2,6,0) + if (!gtk_get_current_event_state(&state)) + gtk_window_set_focus_on_map(GTK_WINDOW(win->window), FALSE); +#endif pidgin_conv_restore_position(win); if (available_list == NULL) { @@ -8907,7 +8914,8 @@ g_signal_connect(G_OBJECT(win->window), "show", G_CALLBACK(winpidgin_ensure_onscreen), win->window); - if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/win32/minimize_new_convs")) + if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/win32/minimize_new_convs") + && !gtk_get_current_event_state(&state)) gtk_window_iconify(GTK_WINDOW(win->window)); #endif