=================================================================== RCS file: /cvsroot/gaim/gaim/configure.ac,v
diff -u -r1.9 configure.ac --- configure.ac 2001/08/28 18:57:09 1.9 +++ configure.ac 2001/08/29 08:48:26 AC_SUBST(STATIC_LINK_LIBS)
AC_DEFINE_UNQUOTED(STATIC_PROTO_INIT, $extern_init void static_proto_init() { $load_proto })
+AC_ARG_ENABLE(gtk2, [ --enable-gtk2 compile using GTK 2],,enable_gtk2=no) AC_ARG_ENABLE(gnome, [ --disable-gnome compile without Gnome bits],,enable_gnome=yes)
-AC_ARG_ENABLE(pixbuf, [ --disable-pixbuf compile without GdkPixbuf (needed for Buddy Icons)],,enable_pixbuf=yes) +AC_ARG_ENABLE(pixbuf, [ --disable-pixbuf compile without GdkPixbuf (needed for Buddy Icons)],,enable_pixbuf=yes) AC_ARG_ENABLE(panel, [ --enable-panel compile as a GNOME applet],,enable_panel=$enable_distrib)
AM_CONDITIONAL(GNOMEAPPLET, test "x$enable_panel" = "xyes")
+if test "x$enable_gtk2" = "xyes" ; then + AM_PATH_GTK_2_0(1.2.3,[ + CFLAGS="$CFLAGS -DGTK_ENABLE_BROKEN" + UI_LIBS="$UI_LIBS $GTK_LIBS" + ],enable_gtk2=no,gthread) if test "x$enable_gnome" = "xyes" ; then
if test "x$enable_panel" = "xyes" ; then
-if test "x$enable_gnome" != "xyes" ; then +if test "x$enable_gnome" != "xyes" -a "x$enable_gtk2" != "xyes" ; then AM_PATH_GLIB(1.2.0,,AC_MSG_ERROR([
*** GLib is required to build Gaim; please make sure you have the GLib
*** development headers installed. The latest version of GLib is
Index: plugins/lagmeter.c =================================================================== RCS file: /cvsroot/gaim/gaim/plugins/lagmeter.c,v
diff -u -r1.13 lagmeter.c --- plugins/lagmeter.c 2001/06/02 02:58:03 1.13 +++ plugins/lagmeter.c 2001/08/29 08:48:27 - confdlg = gtk_window_new(GTK_WINDOW_DIALOG); gtk_window_set_title(GTK_WINDOW(confdlg), "Gaim Lag Delay");
box = gtk_hbox_new(FALSE, 0);
Index: plugins/spellchk.c =================================================================== RCS file: /cvsroot/gaim/gaim/plugins/spellchk.c,v
diff -u -r1.20 spellchk.c --- plugins/spellchk.c 2001/06/02 02:58:03 1.20 +++ plugins/spellchk.c 2001/08/29 08:48:27 char *pair[2] = {"Replace", "With"};
- configwin = gtk_window_new(GTK_WINDOW_DIALOG); gtk_widget_set_usize(configwin, 450, 250);
gtk_window_set_title(GTK_WINDOW(configwin), "Spell Check Config");
Index: plugins/toc_commands.c =================================================================== RCS file: /cvsroot/gaim/gaim/plugins/toc_commands.c,v
diff -u -r1.6 toc_commands.c --- plugins/toc_commands.c 2001/06/02 02:58:03 1.6 +++ plugins/toc_commands.c 2001/08/29 08:48:27 char *gaim_plugin_init(GModule *h) {
- window = gtk_window_new(GTK_WINDOW_DIALOG); gtk_window_set_title(GTK_WINDOW(window), "Gaim - SFLAP interface");
=================================================================== RCS file: /cvsroot/gaim/gaim/src/about.c,v
--- src/about.c 2001/07/31 23:23:40 1.41 +++ src/about.c 2001/08/29 08:48:27 - about = gtk_window_new(GTK_WINDOW_DIALOG); gtk_widget_set_usize(GTK_WIDGET(about), 450, 450);
=================================================================== RCS file: /cvsroot/gaim/gaim/src/away.c,v
--- src/away.c 2001/07/31 23:23:40 1.59 +++ src/away.c 2001/08/29 08:48:28 - imaway = gtk_window_new(GTK_WINDOW_DIALOG); gtk_window_set_wmclass(GTK_WINDOW(imaway), "imaway", "Gaim");
gtk_window_set_title(GTK_WINDOW(imaway), a->name);
=================================================================== RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.238
--- src/buddy.c 2001/08/27 07:11:49 1.238 +++ src/buddy.c 2001/08/29 08:48:30 - blist = gtk_window_new(GTK_WINDOW_DIALOG); blist = gtk_window_new(GTK_WINDOW_TOPLEVEL);
=================================================================== RCS file: /cvsroot/gaim/gaim/src/buddy_chat.c,v
retrieving revision 1.100
diff -u -r1.100 buddy_chat.c --- src/buddy_chat.c 2001/07/31 23:23:40 1.100 +++ src/buddy_chat.c 2001/08/29 08:48:30 - joinchat = gtk_window_new(GTK_WINDOW_DIALOG); gtk_window_set_wmclass(GTK_WINDOW(joinchat), "joinchat", "Gaim");
gtk_window_set_policy(GTK_WINDOW(joinchat), FALSE, TRUE, TRUE);
gtk_widget_realize(joinchat);
- invite = gtk_window_new(GTK_WINDOW_DIALOG); cancel = gtk_button_new_with_label(_("Cancel"));
invite_btn = gtk_button_new_with_label(_("Invite"));
bbox = gtk_hbox_new(TRUE, 10);
Index: src/conversation.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.243
diff -u -r1.243 conversation.c --- src/conversation.c 2001/08/26 20:21:45 1.243 +++ src/conversation.c 2001/08/29 08:48:31 - if (GTK_EDITABLE(c->entry)->has_selection) { - int finish = GTK_EDITABLE(c->entry)->selection_end_pos; + if (GTK_OLD_EDITABLE(c->entry)->has_selection) { + int finish = GTK_OLD_EDITABLE(c->entry)->selection_end_pos; gtk_editable_insert_text(GTK_EDITABLE(c->entry),
buf, strlen(buf), &finish);
- pos = GTK_EDITABLE(c->entry)->current_pos; + pos = GTK_OLD_EDITABLE(c->entry)->current_pos; gtk_editable_insert_text(GTK_EDITABLE(c->entry),
gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
int entry_key_pressed(GtkWidget *w, GtkWidget *entry)
/*------------------------------------------------------------------------*/
tmpo = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
- h = tmpo[GTK_EDITABLE(entry)->current_pos]; - tmpo[GTK_EDITABLE(entry)->current_pos] = '\0'; + h = tmpo[GTK_OLD_EDITABLE(entry)->current_pos]; + tmpo[GTK_OLD_EDITABLE(entry)->current_pos] = '\0'; - tmpo[GTK_EDITABLE(entry)->current_pos] = h; + tmpo[GTK_OLD_EDITABLE(entry)->current_pos] = h; int invert_tags(GtkWidget *entry, char *s1, char *s2, int really)
- int start = GTK_EDITABLE(entry)->selection_start_pos; - int finish = GTK_EDITABLE(entry)->selection_end_pos; + int start = GTK_OLD_EDITABLE(entry)->selection_start_pos; + int finish = GTK_OLD_EDITABLE(entry)->selection_end_pos; s = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
void remove_tags(GtkWidget *entry, char *tag)
- int start = GTK_EDITABLE(entry)->selection_start_pos; - int finish = GTK_EDITABLE(entry)->selection_end_pos; + int start = GTK_OLD_EDITABLE(entry)->selection_start_pos; + int finish = GTK_OLD_EDITABLE(entry)->selection_end_pos; s = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
void surround(GtkWidget *entry, char *pre, char *post)
- int temp, pos = GTK_EDITABLE(entry)->current_pos; + int temp, pos = GTK_OLD_EDITABLE(entry)->current_pos; gtkspell_detach(GTK_TEXT(entry));
- if (GTK_EDITABLE(entry)->has_selection) { + if (GTK_OLD_EDITABLE(entry)->has_selection) { remove_tags(entry, post);
- start = GTK_EDITABLE(entry)->selection_start_pos; - finish = GTK_EDITABLE(entry)->selection_end_pos; + start = GTK_OLD_EDITABLE(entry)->selection_start_pos; + finish = GTK_OLD_EDITABLE(entry)->selection_end_pos; if (invert_tags(entry, pre, post, 1))
s = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
- pos = GTK_EDITABLE(entry)->current_pos; + pos = GTK_OLD_EDITABLE(entry)->current_pos; debug_printf(_("Currently at %d, "), pos);
s2 = strstr(&s[pos], post);
=================================================================== RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.241
diff -u -r1.241 dialogs.c --- src/dialogs.c 2001/08/15 17:26:14 1.241 +++ src/dialogs.c 2001/08/29 08:48:33 - w->window = gtk_window_new(GTK_WINDOW_DIALOG); + GAIM_DIALOG(w->window); dialogwindows = g_list_prepend(dialogwindows, w->window);
gtk_window_set_wmclass(GTK_WINDOW(w->window), "warning", "Gaim");
gtk_window_set_policy(GTK_WINDOW(w->window), FALSE, FALSE, TRUE);
- eedialog = gtk_window_new(GTK_WINDOW_DIALOG); ok = gtk_button_new_with_label(_("OK"));
box = gtk_vbox_new(FALSE, 10);
- imdialog = gtk_window_new(GTK_WINDOW_DIALOG); gtk_window_set_wmclass(GTK_WINDOW(imdialog), "imdialog",
gtk_window_set_policy(GTK_WINDOW(imdialog), FALSE, TRUE, TRUE);
- infodialog = gtk_window_new(GTK_WINDOW_DIALOG); + GAIM_DIALOG(infodialog) gtk_window_set_wmclass(GTK_WINDOW(infodialog), "infodialog",
gtk_window_set_policy(GTK_WINDOW(infodialog), FALSE, TRUE, TRUE);
struct addbuddy *a = g_new0(struct addbuddy, 1);
- a->window = gtk_window_new(GTK_WINDOW_DIALOG); + GAIM_DIALOG(a->window); gtk_window_set_wmclass(GTK_WINDOW(a->window), "add_group", "Gaim");
gtk_window_set_policy(GTK_WINDOW(a->window), FALSE, FALSE, TRUE);
gtk_widget_realize(a->window);
struct addbuddy *a = g_new0(struct addbuddy, 1);
- a->window = gtk_window_new(GTK_WINDOW_DIALOG); + GAIM_DIALOG(a->window); gtk_window_set_wmclass(GTK_WINDOW(a->window), "add_buddy", "Gaim");
gtk_window_set_policy(GTK_WINDOW(a->window), FALSE, FALSE, TRUE);
gtk_window_set_title(GTK_WINDOW(a->window), _("Gaim - Add Buddy"));
struct addbp *b = g_new0(struct addbp, 1);
- b->window = gtk_window_new(GTK_WINDOW_DIALOG); + GAIM_DIALOG(b->window); dialogwindows = g_list_prepend(dialogwindows, b->window);
gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, TRUE, TRUE);
gtk_window_set_wmclass(GTK_WINDOW(b->window), "new_bp", "Gaim");
- b->window = gtk_window_new(GTK_WINDOW_DIALOG); + GAIM_DIALOG(b->window); dialogwindows = g_list_prepend(dialogwindows, b->window);
gtk_window_set_wmclass(GTK_WINDOW(b->window), "set_dir", "Gaim");
gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, TRUE, TRUE);
- b->window = gtk_window_new(GTK_WINDOW_DIALOG); + GAIM_DIALOG(b->window); gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, TRUE, TRUE);
gtk_window_set_wmclass(GTK_WINDOW(b->window), "change_passwd", "Gaim");
gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - Password Change"));
- b->window = gtk_window_new(GTK_WINDOW_DIALOG); + GAIM_DIALOG(b->window); gtk_window_set_wmclass(GTK_WINDOW(b->window), "set_info", "Gaim");
dialogwindows = g_list_prepend(dialogwindows, b->window);
gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - Set User Info"));
- b->window = gtk_window_new(GTK_WINDOW_DIALOG); + GAIM_DIALOG(b->window); dialogwindows = g_list_prepend(dialogwindows, b->window);
gtk_window_set_title(GTK_WINDOW(b->window), "Gaim");
gtk_container_border_width(GTK_CONTAINER(b->window), 5);
- p->window = gtk_window_new(GTK_WINDOW_DIALOG); + GAIM_DIALOG(p->window); gtk_container_set_border_width(GTK_CONTAINER(p->window), 5);
gtk_window_set_policy(GTK_WINDOW(p->window), FALSE, FALSE, TRUE);
gtk_widget_realize(p->window);
struct findbyinfo *b = g_new0(struct findbyinfo, 1);
- b->window = gtk_window_new(GTK_WINDOW_DIALOG); + GAIM_DIALOG(b->window); gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, TRUE, TRUE);
gtk_window_set_wmclass(GTK_WINDOW(b->window), "find_info", "Gaim");
gtk_widget_show(b->window);
struct findbyemail *b = g_new0(struct findbyemail, 1);
if (g_slist_find(connections, gc))
- b->window = gtk_window_new(GTK_WINDOW_DIALOG); + GAIM_DIALOG(b->window); gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, TRUE, TRUE);
gtk_window_set_wmclass(GTK_WINDOW(b->window), "find_email", "Gaim");
gtk_widget_realize(b->window);
struct linkdlg *b = g_new0(struct linkdlg, 1);
- c->link_dialog = gtk_window_new(GTK_WINDOW_DIALOG); + GAIM_DIALOG(c->link_dialog); gtk_window_set_wmclass(GTK_WINDOW(c->link_dialog),
dialogwindows = g_list_prepend(dialogwindows, c->link_dialog);
struct create_away *ca = g_new0(struct create_away, 1);
- ca->window = gtk_window_new(GTK_WINDOW_DIALOG); + GAIM_DIALOG(ca->window); gtk_widget_set_usize(ca->window, -1, 250);
gtk_container_border_width(GTK_CONTAINER(ca->window), 5);
gtk_window_set_wmclass(GTK_WINDOW(ca->window), "away_mess", "Gaim");
/* surround(c->entry, smiley_text, ""); */
- if (GTK_EDITABLE(c->entry)->has_selection) { - int finish = GTK_EDITABLE(c->entry)->selection_end_pos; + if (GTK_OLD_EDITABLE(c->entry)->has_selection) { + int finish = GTK_OLD_EDITABLE(c->entry)->selection_end_pos; gtk_editable_insert_text(GTK_EDITABLE(c->entry),
smiley_text, strlen(smiley_text), &finish);
- int pos = GTK_EDITABLE(c->entry)->current_pos; + int pos = GTK_OLD_EDITABLE(c->entry)->current_pos; gtk_editable_insert_text(GTK_EDITABLE(c->entry),
smiley_text, strlen(smiley_text), &pos);
- dialog = gtk_window_new(GTK_WINDOW_DIALOG); gtk_window_set_policy(GTK_WINDOW(dialog), FALSE, FALSE, TRUE);
gtk_window_set_wmclass(GTK_WINDOW(dialog), "smiley_dialog", "Gaim");
gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_MOUSE);
gtk_widget_destroy(aliasdlg);
- aliasdlg = gtk_window_new(GTK_WINDOW_DIALOG); gtk_window_set_policy(GTK_WINDOW(aliasdlg), FALSE, FALSE, TRUE);
gtk_window_set_wmclass(GTK_WINDOW(aliasdlg), "alias_dialog", "Gaim");
gtk_widget_realize(aliasdlg);
- window = gtk_window_new(GTK_WINDOW_DIALOG); dialogwindows = g_list_prepend(dialogwindows, window);
gtk_window_set_wmclass(GTK_WINDOW(window), "dialog", "Gaim");
gtk_container_set_border_width(GTK_CONTAINER(window), 10);
- rename_dialog = gtk_window_new(GTK_WINDOW_DIALOG); + GAIM_DIALOG(rename_dialog) gtk_window_set_wmclass(GTK_WINDOW(rename_dialog), "rename_dialog",
gtk_window_set_policy(GTK_WINDOW(rename_dialog), FALSE, TRUE, TRUE);
if (!rename_bud_dialog) {
- rename_bud_dialog = gtk_window_new(GTK_WINDOW_DIALOG); + GAIM_DIALOG(rename_bud_dialog) gtk_window_set_wmclass(GTK_WINDOW(rename_bud_dialog), "rename_bud_dialog",
gtk_window_set_policy(GTK_WINDOW(rename_bud_dialog), FALSE, TRUE, TRUE);
=================================================================== RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.246
--- src/gaim.h 2001/08/26 20:21:45 1.246 +++ src/gaim.h 2001/08/29 08:48:33 +#if GTK_CHECK_VERSION(1,3,0) +#define GAIM_DIALOG(x) x = gtk_window_new(GTK_WINDOW_TOPLEVEL); \ + gtk_window_set_type_hint(GTK_WINDOW(x), GDK_WINDOW_TYPE_HINT_DIALOG); +#define gtk_notebook_set_page(x,y) gtk_notebook_set_current_page(x,y) +#define GdkWindowPrivate GdkWindowObject +#define gtk_toolbar_new(x,y) gtk_toolbar_new() +#define GAIM_DIALOG(x) x = gtk_window_new(GTK_WINDOW_DIALOG); +#define GTK_OLD_EDITABLE(x) GTK_EDITABLE(x) =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
diff -u -r1.48 gtkimhtml.c --- src/gtkimhtml.c 2001/08/29 00:04:59 1.48 +++ src/gtkimhtml.c 2001/08/29 08:48:36 &attributes, attributes_mask);
gdk_window_set_user_data (widget->window, widget);
+#if GTK_CHECK_VERSION(1,3,0) + attributes.x = widget->style->xthickness + BORDER_SIZE; + attributes.y = widget->style->xthickness + BORDER_SIZE; attributes.x = widget->style->klass->xthickness + BORDER_SIZE;
attributes.y = widget->style->klass->xthickness + BORDER_SIZE;
attributes.width = MAX (1, (gint) widget->allocation.width - (gint) attributes.x * 2);
attributes.height = MAX (1, (gint) widget->allocation.height - (gint) attributes.y * 2);
attributes.event_mask = gtk_widget_get_events (widget)
gtk_imhtml_draw_focus (GTK_WIDGET (imhtml));
+#if ! GTK_CHECK_VERSION(1,3,0) gtk_imhtml_draw (GtkWidget *widget,
imhtml = GTK_IMHTML (widget);
gtk_imhtml_draw_exposed (imhtml);
gtk_imhtml_style_set (GtkWidget *widget,
widget->allocation = *allocation;
+#if GTK_CHECK_VERSION(1,3,0) new_xsize = MAX (1, (gint) allocation->width -
+ (gint) (widget->style->xthickness + BORDER_SIZE) * 2); + new_ysize = MAX (1, (gint) allocation->height - + (gint) (widget->style->ythickness + BORDER_SIZE) * 2); + if (GTK_WIDGET_REALIZED (widget)) { + gint x = widget->style->xthickness + BORDER_SIZE; + gint y = widget->style->ythickness + BORDER_SIZE; + gdk_window_move_resize (widget->window, + allocation->x, allocation->y, + allocation->width, allocation->height); + gdk_window_move_resize (layout->bin_window, + x, y, new_xsize, new_ysize); + new_xsize = MAX (1, (gint) allocation->width - (gint) (widget->style->klass->xthickness + BORDER_SIZE) * 2);
new_ysize = MAX (1, (gint) allocation->height -
(gint) (widget->style->klass->ythickness + BORDER_SIZE) * 2);
gdk_window_move_resize (layout->bin_window,
x, y, new_xsize, new_ysize);
layout->hadjustment->page_size = new_xsize;
layout->hadjustment->page_increment = new_xsize / 2;
gtk_signal_new ("url_clicked",
+#if GTK_CHECK_VERSION(1,3,0) + GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkIMHtmlClass, url_clicked),
gtk_marshal_NONE__POINTER,
+#if ! GTK_CHECK_VERSION(1,3,0) gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
+ widget_class->draw = gtk_imhtml_draw; + widget_class->draw_focus = gtk_imhtml_draw_focus; object_class->destroy = gtk_imhtml_destroy;
widget_class->realize = gtk_imhtml_realize;
- widget_class->draw = gtk_imhtml_draw; - widget_class->draw_focus = gtk_imhtml_draw_focus; widget_class->style_set = gtk_imhtml_style_set;
widget_class->expose_event = gtk_imhtml_expose_event;
widget_class->size_allocate = gtk_imhtml_size_allocate;
gtk_widget_set_usize (GTK_WIDGET (imhtml), -1, imhtml->y);
+#if GTK_CHECK_VERSION(1,3,0) + if (!(options & GTK_IMHTML_NO_SCROLL) && + (GTK_WIDGET (imhtml)->allocation.height - + (GTK_WIDGET (imhtml)->style->ythickness + BORDER_SIZE) * 2)))) + gtk_adjustment_set_value (vadj, imhtml->y - + MAX (1, (GTK_WIDGET (imhtml)->allocation.height - + (GTK_WIDGET (imhtml)->style->ythickness + if (!(options & GTK_IMHTML_NO_SCROLL) &&
MAX (1, (GTK_WIDGET (imhtml)->allocation.height -
(GTK_WIDGET (imhtml)->style->klass->ythickness +
=================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkticker.c,v
diff -u -r1.2 gtkticker.c --- src/gtkticker.c 2000/11/21 01:00:45 1.2 +++ src/gtkticker.c 2001/08/29 08:48:36 static void gtk_ticker_compute_offsets (GtkTicker *ticker);
static void gtk_ticker_class_init (GtkTickerClass *klass);
widget_class->realize = gtk_ticker_realize;
widget_class->size_request = gtk_ticker_size_request;
widget_class->size_allocate = gtk_ticker_size_allocate;
+#if ! GTK_CHECK_VERSION(1,3,0) widget_class->draw = gtk_ticker_draw;
widget_class->expose_event = gtk_ticker_expose;
container_class->add = gtk_ticker_add_real;
=================================================================== RCS file: /cvsroot/gaim/gaim/src/multi.c,v
--- src/multi.c 2001/08/24 17:26:21 1.68 +++ src/multi.c 2001/08/29 08:48:37 gtk_widget_show(u->passprmt);
- u->passprmt = gtk_window_new(GTK_WINDOW_DIALOG); + GAIM_DIALOG(u->passprmt); gtk_window_set_wmclass(GTK_WINDOW(u->passprmt), "password", "Gaim");
gtk_container_border_width(GTK_CONTAINER(u->passprmt), 5);
gtk_signal_connect(GTK_OBJECT(u->passprmt), "destroy", GTK_SIGNAL_FUNC(pass_des), u);
GtkWidget *box, *label, *button;
- gc->meter = gtk_window_new(GTK_WINDOW_DIALOG); + GAIM_DIALOG(gc->meter); gtk_window_set_policy(GTK_WINDOW(gc->meter), 0, 0, 1);
gtk_window_set_wmclass(GTK_WINDOW(gc->meter), "signon", "Gaim");
gtk_container_set_border_width(GTK_CONTAINER(gc->meter), 5);
=================================================================== RCS file: /cvsroot/gaim/gaim/src/plugins.c,v
--- src/plugins.c 2001/08/20 20:39:29 1.74 +++ src/plugins.c 2001/08/29 08:48:38 - plugwindow = gtk_window_new(GTK_WINDOW_DIALOG); + GAIM_DIALOG(plugwindow) gtk_window_set_wmclass(GTK_WINDOW(plugwindow), "plugins", "Gaim");
gtk_widget_realize(plugwindow);
aol_icon(plugwindow->window);
=================================================================== RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.172
--- src/prefs.c 2001/07/31 23:23:40 1.172 +++ src/prefs.c 2001/08/29 08:48:39 dw = g_new0(struct debug_window, 1);
box = gtk_hbox_new(FALSE, 0);
- dw->window = gtk_window_new(GTK_WINDOW_DIALOG); + GAIM_DIALOG(dw->window); gtk_window_set_title(GTK_WINDOW(dw->window), _("GAIM debug output window"));
gtk_window_set_wmclass(GTK_WINDOW(dw->window), "debug_out", "Gaim");
gtk_container_add(GTK_CONTAINER(dw->window), box);
=================================================================== RCS file: /cvsroot/gaim/gaim/src/prpl.c,v
--- src/prpl.c 2001/08/22 21:11:58 1.25 +++ src/prpl.c 2001/08/29 08:48:39 - window = gtk_window_new(GTK_WINDOW_DIALOG); gtk_window_set_wmclass(GTK_WINDOW(window), "accept", "Gaim");
gtk_window_set_policy(GTK_WINDOW(window), FALSE, TRUE, TRUE);
gtk_window_set_title(GTK_WINDOW(window), _("Accept?"));
- window = gtk_window_new(GTK_WINDOW_DIALOG); gtk_window_set_wmclass(GTK_WINDOW(window), "prompt", "Gaim");
gtk_window_set_policy(GTK_WINDOW(window), FALSE, TRUE, TRUE);
"overwrite the file%s or cancel the transfer?", name,
(size <= fr->size) ? ", resume the download," : "");
- window = gtk_window_new(GTK_WINDOW_DIALOG); Index: src/protocols/napster/napster.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/protocols/napster/napster.c,v
--- src/protocols/napster/napster.c 2001/08/27 07:11:49 1.6 +++ src/protocols/napster/napster.c 2001/08/29 08:48:53 struct browse_window *browse = g_new0(struct browse_window, 1);
struct nap_data *ndata = (struct nap_data *)gc->proto_data;
- browse->window = gtk_window_new(GTK_WINDOW_DIALOG); + GAIM_DIALOG(browse->window) browse->name = g_strdup(name);
browse->list = gtk_clist_new(1);
gchar *titles[5] = {"Mp3 Name", "Nick", "Size", "Bitrate", "Connection"};
search_dialog = g_new0(struct search_window, 1);
- window = gtk_window_new(GTK_WINDOW_DIALOG); vbox = gtk_vbox_new(FALSE, 0);