summaryrefslogtreecommitdiff
path: root/pidgin/gtkdialogs.h
diff options
context:
space:
mode:
authorSadrul Habib Chowdhury <sadrul@pidgin.im>2008-10-31 07:59:46 +0000
committerSadrul Habib Chowdhury <sadrul@pidgin.im>2008-10-31 07:59:46 +0000
commitd3cc5bf24a5f759be9b7a83e12e8229196ca8e34 (patch)
tree71a090201ae21d68b0825085fefebf9bc2748fb0 /pidgin/gtkdialogs.h
parent65a637da9cd60700ec178cde1ed3dd24e0695f46 (diff)
parent7902d6c9d6e8608a7147949eaa1838206a3b14ea (diff)
downloadpidgin-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/gtkdialogs.h')
-rw-r--r--pidgin/gtkdialogs.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/pidgin/gtkdialogs.h b/pidgin/gtkdialogs.h
index a663a679e3..3a66249652 100644
--- a/pidgin/gtkdialogs.h
+++ b/pidgin/gtkdialogs.h
@@ -38,11 +38,13 @@ void pidgin_dialogs_im_with_user(PurpleAccount *, const char *);
void pidgin_dialogs_info(void);
void pidgin_dialogs_log(void);
+#if !(defined PIDGIN_DISABLE_DEPRECATED) || (defined _PIDGIN_GTKDIALOGS_C_)
/**
* @deprecated This function is no longer used and will be removed in
* Pidgin 3.0.0 unless there is sufficient demand to keep it.
*/
void pidgin_dialogs_alias_contact(PurpleContact *);
+#endif
void pidgin_dialogs_alias_buddy(PurpleBuddy *);
void pidgin_dialogs_alias_chat(PurpleChat *);
@@ -55,9 +57,12 @@ void pidgin_dialogs_merge_groups(PurpleGroup *, const char *);
/* Everything after this should probably be moved elsewhere */
#ifndef PIDGIN_DISABLE_DEPRECATED
+/* This PIDGIN_DISABLE_DEPRECATED doesn't need to be deactivated by
+ * _PIDGIN_GTKDIALOGS_C_, because it shouldn't be using this macro. */
#define PIDGIN_DIALOG(x) x = gtk_window_new(GTK_WINDOW_TOPLEVEL); \
gtk_window_set_type_hint(GTK_WINDOW(x), GDK_WINDOW_TYPE_HINT_DIALOG)
#endif
+
#define PIDGIN_WINDOW_ICONIFIED(x) (gdk_window_get_state(GTK_WIDGET(x)->window) & GDK_WINDOW_STATE_ICONIFIED)
#endif /* _PIDGINDIALOGS_H_ */