Mercurial > pidgin.yaz
changeset 15510:567a499c3b06
dialogs
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Sat, 03 Feb 2007 09:03:46 +0000 |
| parents | 23ca11f8a8c4 |
| children | 760ef6d78d2d |
| files | pidgin/gtkblist.c pidgin/gtkdebug.c pidgin/gtkdialogs.c pidgin/gtkdialogs.h pidgin/gtkimhtmltoolbar.c |
| diffstat | 5 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkblist.c Sat Feb 03 08:56:16 2007 +0000 +++ b/pidgin/gtkblist.c Sat Feb 03 09:03:46 2007 +0000 @@ -5034,7 +5034,7 @@ return; if (show) { - if(!GAIM_WINDOW_ICONIFIED(gtkblist->window) && !GTK_WIDGET_VISIBLE(gtkblist->window)) + if(!PIDGIN_WINDOW_ICONIFIED(gtkblist->window) && !GTK_WIDGET_VISIBLE(gtkblist->window)) gaim_signal_emit(pidgin_blist_get_handle(), "gtkblist-unhiding", gtkblist); pidgin_blist_restore_position(); gtk_window_present(GTK_WINDOW(gtkblist->window)); @@ -5664,7 +5664,7 @@ { if (gtkblist && gtkblist->window) { if (GTK_WIDGET_VISIBLE(gtkblist->window)) { - gaim_blist_set_visible(GAIM_WINDOW_ICONIFIED(gtkblist->window) || gtk_blist_obscured); + gaim_blist_set_visible(PIDGIN_WINDOW_ICONIFIED(gtkblist->window) || gtk_blist_obscured); } else { gaim_blist_set_visible(TRUE); }
--- a/pidgin/gtkdebug.c Sat Feb 03 08:56:16 2007 +0000 +++ b/pidgin/gtkdebug.c Sat Feb 03 09:03:46 2007 +0000 @@ -699,7 +699,7 @@ width = gaim_prefs_get_int("/gaim/gtk/debug/width"); height = gaim_prefs_get_int("/gaim/gtk/debug/height"); - GAIM_DIALOG(win->window); + PIDGIN_DIALOG(win->window); gaim_debug_info("gtkdebug", "Setting dimensions to %d, %d\n", width, height);
--- a/pidgin/gtkdialogs.c Sat Feb 03 08:56:16 2007 +0000 +++ b/pidgin/gtkdialogs.c Sat Feb 03 09:03:46 2007 +0000 @@ -307,7 +307,7 @@ return; } - GAIM_DIALOG(about); + PIDGIN_DIALOG(about); gtk_window_set_title(GTK_WINDOW(about), _("About " PIDGIN_NAME)); gtk_window_set_role(GTK_WINDOW(about), "about"); gtk_window_set_resizable(GTK_WINDOW(about), TRUE);
--- a/pidgin/gtkdialogs.h Sat Feb 03 08:56:16 2007 +0000 +++ b/pidgin/gtkdialogs.h Sat Feb 03 09:03:46 2007 +0000 @@ -51,8 +51,8 @@ /** * Our UI's identifier. */ -#define GAIM_DIALOG(x) x = gtk_window_new(GTK_WINDOW_TOPLEVEL); \ +#define PIDGIN_DIALOG(x) x = gtk_window_new(GTK_WINDOW_TOPLEVEL); \ gtk_window_set_type_hint(GTK_WINDOW(x), GDK_WINDOW_TYPE_HINT_DIALOG) -#define GAIM_WINDOW_ICONIFIED(x) (gdk_window_get_state(GTK_WIDGET(x)->window) & GDK_WINDOW_STATE_ICONIFIED) +#define PIDGIN_WINDOW_ICONIFIED(x) (gdk_window_get_state(GTK_WIDGET(x)->window) & GDK_WINDOW_STATE_ICONIFIED) #endif /* _PIDGINDIALOGS_H_ */
--- a/pidgin/gtkimhtmltoolbar.c Sat Feb 03 08:56:16 2007 +0000 +++ b/pidgin/gtkimhtmltoolbar.c Sat Feb 03 09:03:46 2007 +0000 @@ -666,7 +666,7 @@ smileys = smileys->next; } - GAIM_DIALOG(dialog); + PIDGIN_DIALOG(dialog); gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE); gtk_window_set_role(GTK_WINDOW(dialog), "smiley_dialog");