comparison pidgin/gtkdebug.c @ 21229:0b67d509a305

merge of '1bcf84e26d11f259b3c5ec663e3fecc2f01aed33' and 'ce13b5ca4994abbd4934b3bc568c8b115335c426'
author Richard Laager <rlaager@wiktel.com>
date Sun, 14 Oct 2007 02:41:00 +0000
parents 84b9b98070e5
children fba1f6c3df0b 80af064d311c
comparison
equal deleted inserted replaced
21098:7e200a629109 21229:0b67d509a305
34 #include "gtkdebug.h" 34 #include "gtkdebug.h"
35 #include "gtkdialogs.h" 35 #include "gtkdialogs.h"
36 #include "gtkimhtml.h" 36 #include "gtkimhtml.h"
37 #include "gtkutils.h" 37 #include "gtkutils.h"
38 #include "pidginstock.h" 38 #include "pidginstock.h"
39 #include "gtkblist.h"
39 40
40 #ifdef HAVE_REGEX_H 41 #ifdef HAVE_REGEX_H
41 # include <regex.h> 42 # include <regex.h>
42 #endif /* HAVE_REGEX_H */ 43 #endif /* HAVE_REGEX_H */
43 44
671 } 672 }
672 673
673 static DebugWindow * 674 static DebugWindow *
674 debug_window_new(void) 675 debug_window_new(void)
675 { 676 {
677 PidginBuddyList *blist;
676 DebugWindow *win; 678 DebugWindow *win;
677 GtkWidget *vbox; 679 GtkWidget *vbox;
678 GtkWidget *toolbar; 680 GtkWidget *toolbar;
679 GtkWidget *frame; 681 GtkWidget *frame;
680 GtkWidget *image; 682 GtkWidget *image;
685 687
686 width = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/debug/width"); 688 width = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/debug/width");
687 height = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/debug/height"); 689 height = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/debug/height");
688 690
689 PIDGIN_DIALOG(win->window); 691 PIDGIN_DIALOG(win->window);
692 if ((blist = pidgin_blist_get_default_gtk_blist()) != NULL)
693 if (blist->window)
694 gtk_window_set_transient_for(GTK_WINDOW(win->window), GTK_WINDOW(blist->window));
690 purple_debug_info("gtkdebug", "Setting dimensions to %d, %d\n", 695 purple_debug_info("gtkdebug", "Setting dimensions to %d, %d\n",
691 width, height); 696 width, height);
692 697
693 gtk_window_set_default_size(GTK_WINDOW(win->window), width, height); 698 gtk_window_set_default_size(GTK_WINDOW(win->window), width, height);
694 gtk_window_set_role(GTK_WINDOW(win->window), "debug"); 699 gtk_window_set_role(GTK_WINDOW(win->window), "debug");