diff options
| author | Sadrul Habib Chowdhury <sadrul@pidgin.im> | 2008-10-31 07:59:46 +0000 |
|---|---|---|
| committer | Sadrul Habib Chowdhury <sadrul@pidgin.im> | 2008-10-31 07:59:46 +0000 |
| commit | d3cc5bf24a5f759be9b7a83e12e8229196ca8e34 (patch) | |
| tree | 71a090201ae21d68b0825085fefebf9bc2748fb0 /pidgin/plugins | |
| parent | 65a637da9cd60700ec178cde1ed3dd24e0695f46 (diff) | |
| parent | 7902d6c9d6e8608a7147949eaa1838206a3b14ea (diff) | |
| download | pidgin-sadrul.struct.hiding.tar.gz | |
propagate from branch 'im.pidgin.pidgin' (head 328a7b5211ba8112c8978d5b81f5e39bf2ce2596)sadrul.struct.hiding
to branch 'local.struct.hiding' (head ee0f2a4594bf5beb531faa4978a7a450903a6017)
Diffstat (limited to 'pidgin/plugins')
| -rw-r--r-- | pidgin/plugins/notify.c | 6 | ||||
| -rw-r--r-- | pidgin/plugins/perl/common/gtkmodule.h | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/pidgin/plugins/notify.c b/pidgin/plugins/notify.c index 7ad0b7d211..3924556758 100644 --- a/pidgin/plugins/notify.c +++ b/pidgin/plugins/notify.c @@ -557,9 +557,7 @@ handle_count_xprop(PidginWindow *purplewin) static void handle_urgent(PidginWindow *win, gboolean set) { -#ifndef _WIN32 pidgin_set_urgent(GTK_WINDOW(win->window), set); -#endif } static void @@ -767,12 +765,14 @@ get_config_frame(PurplePlugin *plugin) /* Urgent method button */ toggle = gtk_check_button_new_with_mnemonic(_("Set window manager \"_URGENT\" hint")); +#else + toggle = gtk_check_button_new_with_mnemonic(_("_Flash window")); +#endif gtk_box_pack_start(GTK_BOX(vbox), toggle, FALSE, FALSE, 0); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle), purple_prefs_get_bool("/plugins/gtk/X11/notify/method_urgent")); g_signal_connect(G_OBJECT(toggle), "toggled", G_CALLBACK(method_toggle_cb), "method_urgent"); -#endif /* Raise window method button */ toggle = gtk_check_button_new_with_mnemonic(_("R_aise conversation window")); diff --git a/pidgin/plugins/perl/common/gtkmodule.h b/pidgin/plugins/perl/common/gtkmodule.h index 5b566babae..7151f077fb 100644 --- a/pidgin/plugins/perl/common/gtkmodule.h +++ b/pidgin/plugins/perl/common/gtkmodule.h @@ -1,3 +1,7 @@ +/* Allow the Perl code to see deprecated functions, so we can continue to + * export them to Perl plugins. */ +#undef PIDGIN_DISABLE_DEPRECATED + typedef struct group *Pidgin__Group; #define group perl_group |