Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv15123/src
Modified Files:
about.c away.c buddy.c buddy_chat.c dialogs.c dnd-hints.c
gtkconv.c gtkimhtml.c log.c main.c multi.c prefs.c prpl.c
server.c ui.h util.c
Log Message:
remove deprecated gtk calls, gtk2-ify log viewer, gtk2-ify jabber vcard
dialog, and probably a cleanup or two I forgot about.
Index: about.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/about.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- about.c 4 Jan 2003 14:41:30 -0000 1.84
+++ about.c 2 Mar 2003 19:21:18 -0000 1.85
@@ -75,7 +75,7 @@
g_snprintf(abouttitle, sizeof(abouttitle), _("About Gaim v%s"), VERSION);
gtk_window_set_title(GTK_WINDOW(about), abouttitle);
gtk_window_set_role(GTK_WINDOW(about), "about");
- gtk_window_set_policy(GTK_WINDOW(about), FALSE, TRUE, TRUE);
+ gtk_window_set_resizable(GTK_WINDOW(about), TRUE);
gtk_widget_realize(about);
vbox = gtk_vbox_new(FALSE, 5);
Index: away.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/away.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- away.c 24 Feb 2003 00:29:51 -0000 1.88
+++ away.c 2 Mar 2003 19:21:20 -0000 1.89
@@ -233,7 +233,7 @@
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_NEVER,
GTK_POLICY_ALWAYS);
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_IN);
- gtk_widget_set_usize(sw, 245, 120);
+ gtk_widget_set_size_request(sw, 245, 120);
gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0);
gtk_widget_show(sw);
@@ -327,9 +327,9 @@
save_prefs();
}
-static void set_gc_away(GtkObject *obj, struct gaim_connection *gc)
+static void set_gc_away(GObject *obj, struct gaim_connection *gc)
{
- struct away_message *awy = gtk_object_get_user_data(obj);
+ struct away_message *awy = g_object_get_data(obj, "away_message");
if (awy)
serv_set_away(gc, GAIM_AWAY_CUSTOM, awy->message);
@@ -337,9 +337,9 @@
serv_set_away(gc, GAIM_AWAY_CUSTOM, NULL);
}
-static void set_gc_state(GtkObject *obj, struct gaim_connection *gc)
+static void set_gc_state(GObject *obj, struct gaim_connection *gc)
{
- char *awy = gtk_object_get_user_data(obj);
+ char *awy = g_object_get_data(obj, "away_state");
serv_set_away(gc, awy, NULL);
}
@@ -350,44 +350,30 @@
GtkWidget *remmenu;
GtkWidget *submenu, *submenu2;
GtkWidget *remitem;
- GtkWidget *label;
GtkWidget *sep;
GList *l;
- GtkWidget *list_item;
GSList *awy = away_messages;
struct away_message *a;
GSList *con = connections;
struct gaim_connection *gc = NULL;
int count = 0;
- if (prefs_away_list != NULL) {
- GtkWidget *hbox;
- gtk_list_clear_items(GTK_LIST(prefs_away_list), 0, -1);
+ if (prefs_away_store != NULL) {
+ gtk_list_store_clear(prefs_away_store);
while (awy) {
+ GtkTreeIter iter;
a = (struct away_message *)awy->data;
- list_item = gtk_list_item_new();
- gtk_container_add(GTK_CONTAINER(prefs_away_list), list_item);
- g_signal_connect(GTK_OBJECT(list_item), "select",
- G_CALLBACK(away_list_clicked), a);
- gtk_object_set_user_data(GTK_OBJECT(list_item), a);
- gtk_widget_show(list_item);
-
- hbox = gtk_hbox_new(FALSE, 5);
- gtk_container_add(GTK_CONTAINER(list_item), hbox);
- gtk_widget_show(hbox);
-
- label = gtk_label_new(a->name);
- gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
- gtk_widget_show(label);
-
+ gtk_list_store_append(prefs_away_store, &iter);
+ gtk_list_store_set(prefs_away_store, &iter,
+ 0, a->name,
+ 1, a,
+ -1);
awy = g_slist_next(awy);
}
- if (away_messages != NULL)
- gtk_list_select_item(GTK_LIST(prefs_away_list), 0);
}
if (awaymenu) {
- l = gtk_container_children(GTK_CONTAINER(awaymenu));
+ l = gtk_container_get_children(GTK_CONTAINER(awaymenu));
while (l) {
gtk_container_remove(GTK_CONTAINER(awaymenu), GTK_WIDGET(l->data));
@@ -398,7 +384,7 @@
remmenu = gtk_menu_new();
menuitem = gtk_menu_item_new_with_label(_("New Away Message"));
- gtk_menu_append(GTK_MENU(awaymenu), menuitem);
+ gtk_menu_shell_append(GTK_MENU_SHELL(awaymenu), menuitem);
gtk_widget_show(menuitem);
g_signal_connect(GTK_OBJECT(menuitem), "activate", G_CALLBACK(create_away_mess),
NULL);
@@ -408,7 +394,7 @@
a = (struct away_message *)awy->data;
remitem = gtk_menu_item_new_with_label(a->name);
- gtk_menu_append(GTK_MENU(remmenu), remitem);
+ gtk_menu_shell_append(GTK_MENU_SHELL(remmenu), remitem);
gtk_widget_show(remitem);
g_signal_connect(GTK_OBJECT(remitem), "activate",
G_CALLBACK(rem_away_mess), a);
@@ -418,14 +404,14 @@
}
menuitem = gtk_menu_item_new_with_label(_("Remove Away Message"));
- gtk_menu_append(GTK_MENU(awaymenu), menuitem);
+ gtk_menu_shell_append(GTK_MENU_SHELL(awaymenu), menuitem);
gtk_widget_show(menuitem);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), remmenu);
gtk_widget_show(remmenu);
sep = gtk_hseparator_new();
menuitem = gtk_menu_item_new();
- gtk_menu_append(GTK_MENU(awaymenu), menuitem);
+ gtk_menu_shell_append(GTK_MENU_SHELL(awaymenu), menuitem);
gtk_container_add(GTK_CONTAINER(menuitem), sep);
gtk_widget_set_sensitive(menuitem, FALSE);
gtk_widget_show(menuitem);
@@ -458,8 +444,8 @@
a = (struct away_message *)awy->data;
menuitem = gtk_menu_item_new_with_label(a->name);
- gtk_object_set_user_data(GTK_OBJECT(menuitem), a);
- gtk_menu_append(GTK_MENU(awaymenu), menuitem);
+ g_object_set_data(G_OBJECT(menuitem), "away_message", a);
+ gtk_menu_shell_append(GTK_MENU_SHELL(awaymenu), menuitem);
gtk_widget_show(menuitem);
g_signal_connect(GTK_OBJECT(menuitem), "activate",
G_CALLBACK(do_away_message), a);
@@ -471,8 +457,8 @@
awy = away_messages;
menuitem = gtk_menu_item_new_with_label(msgs->data);
- gtk_object_set_user_data(GTK_OBJECT(menuitem), msgs->data);
- gtk_menu_append(GTK_MENU(awaymenu), menuitem);
+ g_object_set_data(G_OBJECT(menuitem), "away_state", msgs->data);
+ gtk_menu_shell_append(GTK_MENU_SHELL(awaymenu), menuitem);
gtk_widget_show(menuitem);
if (strcmp(msgs->data, GAIM_AWAY_CUSTOM)) {
@@ -488,9 +474,10 @@
a = (struct away_message *)awy->data;
menuitem = gtk_menu_item_new_with_label(a->name);
- gtk_object_set_user_data(GTK_OBJECT(menuitem),
- a);
- gtk_menu_append(GTK_MENU(submenu), menuitem);
+ g_object_set_data(G_OBJECT(menuitem), "away_message",
+ a);
+ gtk_menu_shell_append(GTK_MENU_SHELL(submenu),
+ menuitem);
gtk_widget_show(menuitem);
g_signal_connect(GTK_OBJECT(menuitem),
"activate",
@@ -518,7 +505,7 @@
g_snprintf(buf, sizeof(buf), "%s (%s)",
gc->username, gc->prpl->name);
menuitem = gtk_menu_item_new_with_label(buf);
- gtk_menu_append(GTK_MENU(awaymenu), menuitem);
+ gtk_menu_shell_append(GTK_MENU_SHELL(awaymenu), menuitem);
gtk_widget_show(menuitem);
submenu = gtk_menu_new();
@@ -530,14 +517,14 @@
if ((g_list_length(msgs) == 1) &&
(!strcmp(msgs->data, GAIM_AWAY_CUSTOM))) {
menuitem = gtk_menu_item_new_with_label(_("Back"));
- gtk_menu_append(GTK_MENU(submenu), menuitem);
+ gtk_menu_shell_append(GTK_MENU_SHELL(submenu), menuitem);
gtk_widget_show(menuitem);
g_signal_connect(GTK_OBJECT(menuitem), "activate",
G_CALLBACK(set_gc_away), gc);
sep = gtk_hseparator_new();
menuitem = gtk_menu_item_new();
- gtk_menu_append(GTK_MENU(submenu), menuitem);
+ gtk_menu_shell_append(GTK_MENU_SHELL(submenu), menuitem);
gtk_container_add(GTK_CONTAINER(menuitem), sep);
gtk_widget_set_sensitive(menuitem, FALSE);
gtk_widget_show(menuitem);
@@ -549,8 +536,8 @@
a = (struct away_message *)awy->data;
menuitem = gtk_menu_item_new_with_label(a->name);
- gtk_object_set_user_data(GTK_OBJECT(menuitem), a);
- gtk_menu_append(GTK_MENU(submenu), menuitem);
+ g_object_set_data(G_OBJECT(menuitem), "away_message", a);
+ gtk_menu_shell_append(GTK_MENU_SHELL(submenu), menuitem);
gtk_widget_show(menuitem);
g_signal_connect(GTK_OBJECT(menuitem), "activate",
G_CALLBACK(set_gc_away), gc);
@@ -562,9 +549,9 @@
awy = away_messages;
menuitem = gtk_menu_item_new_with_label(msgs->data);
- gtk_object_set_user_data(GTK_OBJECT(menuitem),
+ g_object_set_data(G_OBJECT(menuitem), "away_state",
msgs->data);
- gtk_menu_append(GTK_MENU(submenu), menuitem);
+ gtk_menu_shell_append(GTK_MENU_SHELL(submenu), menuitem);
gtk_widget_show(menuitem);
if (strcmp(msgs->data, GAIM_AWAY_CUSTOM)) {
@@ -584,9 +571,9 @@
menuitem =
gtk_menu_item_new_with_label(a->
name);
- gtk_object_set_user_data(GTK_OBJECT
- (menuitem), a);
- gtk_menu_append(GTK_MENU(submenu2),
+ g_object_set_data(G_OBJECT(menuitem),
+ "away_message", a);
+ gtk_menu_shell_append(GTK_MENU_SHELL(submenu2),
menuitem);
gtk_widget_show(menuitem);
g_signal_connect(GTK_OBJECT(menuitem),
@@ -606,7 +593,7 @@
}
menuitem = gtk_menu_item_new_with_label(_("Set All Away"));
- gtk_menu_append(GTK_MENU(awaymenu), menuitem);
+ gtk_menu_shell_append(GTK_MENU_SHELL(awaymenu), menuitem);
gtk_widget_show(menuitem);
submenu = gtk_menu_new();
@@ -619,8 +606,8 @@
a = (struct away_message *)awy->data;
menuitem = gtk_menu_item_new_with_label(a->name);
- gtk_object_set_user_data(GTK_OBJECT(menuitem), a);
- gtk_menu_append(GTK_MENU(submenu), menuitem);
+ g_object_set_data(G_OBJECT(menuitem), "away_message", a);
+ gtk_menu_shell_append(GTK_MENU_SHELL(submenu), menuitem);
gtk_widget_show(menuitem);
g_signal_connect(GTK_OBJECT(menuitem), "activate",
G_CALLBACK(do_away_message), a);
@@ -630,7 +617,7 @@
}
}
if (prefs_away_menu) {
- l = gtk_container_children(GTK_CONTAINER(prefs_away_menu));
+ l = gtk_container_get_children(GTK_CONTAINER(prefs_away_menu));
while (l) {
gtk_widget_destroy(GTK_WIDGET(l->data));
l = l->next;
Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -d -r1.401 -r1.402
--- buddy.c 24 Feb 2003 00:29:51 -0000 1.401
+++ buddy.c 2 Mar 2003 19:21:21 -0000 1.402
@@ -19,6 +19,12 @@
*
*/
+#ifdef GTK_DISABLE_DEPRECATED
+#undef GTK_DISABLE_DEPRECATED
+#endif
+
+#define GTK_ENABLE_BROKEN
+
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
Index: buddy_chat.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy_chat.c,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -d -r1.192 -r1.193
--- buddy_chat.c 26 Jan 2003 05:11:36 -0000 1.192
+++ buddy_chat.c 2 Mar 2003 19:21:23 -0000 1.193
@@ -52,7 +52,7 @@
char *sval;
for (tmp = chatentries; tmp != NULL; tmp = tmp->next) {
- if (gtk_object_get_user_data(tmp->data)) {
+ if (g_object_get_data(tmp->data, "is_spin")) {
ival = g_new0(int, 1);
*ival = gtk_spin_button_get_value_as_int(tmp->data);
data = g_list_append(data, ival);
@@ -121,9 +121,9 @@
adjust = gtk_adjustment_new(pce->min, pce->min,
pce->max, 1, 10, 10);
spin = gtk_spin_button_new(GTK_ADJUSTMENT(adjust), 1, 0);
- gtk_object_set_user_data(GTK_OBJECT(spin), (void *)1);
+ g_object_set_data(G_OBJECT(spin), "is_spin", GINT_TO_POINTER(TRUE));
chatentries = g_list_append(chatentries, spin);
- gtk_widget_set_usize(spin, 50, -1);
+ gtk_widget_set_size_request(spin, 50, -1);
gtk_box_pack_end(GTK_BOX(rowbox), spin, FALSE, FALSE, 0);
gtk_widget_show(spin);
}
@@ -194,12 +194,12 @@
g_snprintf(buf, sizeof(buf), "%s (%s)", g->username, g->prpl->name);
opt = gtk_menu_item_new_with_label(buf);
- gtk_object_set_user_data(GTK_OBJECT(opt), g);
+ g_object_set_data(G_OBJECT(opt), "gaim_connection", g);
g_signal_connect(G_OBJECT(opt), "activate",
G_CALLBACK(joinchat_choose), g);
- gtk_menu_append(GTK_MENU(menu), opt);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), opt);
gtk_widget_show(opt);
}
@@ -251,7 +251,7 @@
if (!joinchat) {
GAIM_DIALOG(joinchat);
gtk_window_set_role(GTK_WINDOW(joinchat), "joinchat");
- gtk_window_set_policy(GTK_WINDOW(joinchat), FALSE, TRUE, TRUE);
+ gtk_window_set_resizable(GTK_WINDOW(joinchat), TRUE);
gtk_widget_realize(joinchat);
g_signal_connect(G_OBJECT(joinchat), "delete_event",
G_CALLBACK(destroy_join_chat), joinchat);
Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.425
retrieving revision 1.426
diff -u -d -r1.425 -r1.426
--- dialogs.c 1 Mar 2003 18:37:47 -0000 1.425
+++ dialogs.c 2 Mar 2003 19:21:23 -0000 1.426
@@ -276,31 +276,31 @@
struct gaim_gtk_conversation *gtkconv;
gchar *object_data;
- object_data = gtk_object_get_user_data(GTK_OBJECT(w));
+ object_data = g_object_get_data(G_OBJECT(w), "dialog_type");
gtkconv = GAIM_GTK_CONVERSATION(c);
if (GTK_IS_COLOR_SELECTION_DIALOG(w)) {
gaim_gtk_set_state_lock(TRUE);
if (w == gtkconv->dialogs.fg_color) {
[...1116 lines suppressed...]
+ gtk_text_view_get_buffer(GTK_TEXT_VIEW(mtd->textbox)),
+ mtd->text?mtd->text:"", -1);
+ gtk_container_add(GTK_CONTAINER (sw), mtd->textbox);
gtk_widget_show(mtd->textbox);
- gtk_widget_show (vscrollbar);
- gtk_widget_show(hbox);
+ gtk_widget_show(sw);
gtk_widget_show(frame);
}
@@ -5353,8 +5371,7 @@
g_free(((MultiTextData *) list->data)->text);
}
((MultiTextData *) list->data)->text =
- gtk_editable_get_chars((GtkEditable *) (((MultiTextData *) list->data)->textbox),
- 0, -1);
+ gtk_text_view_get_text(GTK_TEXT_VIEW(((MultiTextData *) list->data)->textbox), FALSE);
}
Index: dnd-hints.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dnd-hints.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dnd-hints.c 20 Jan 2003 16:57:08 -0000 1.2
+++ dnd-hints.c 2 Mar 2003 19:21:26 -0000 1.3
@@ -63,14 +63,12 @@
gdk_pixbuf_render_pixmap_and_mask(pixbuf, &pixmap, &bitmap, 128);
gdk_pixbuf_unref(pixbuf);
- gtk_widget_push_visual(gdk_rgb_get_visual());
gtk_widget_push_colormap(gdk_rgb_get_cmap());
win = gtk_window_new(GTK_WINDOW_POPUP);
- pix = gtk_pixmap_new(pixmap, bitmap);
+ pix = gtk_image_new_from_pixmap(pixmap, bitmap);
gtk_widget_realize(win);
gtk_container_add(GTK_CONTAINER(win), pix);
gtk_widget_shape_combine_mask(win, bitmap, 0, 0);
- gtk_widget_pop_visual();
gtk_widget_pop_colormap();
gdk_pixmap_unref(pixmap);
@@ -158,7 +156,7 @@
if (w && GTK_IS_WIDGET(w))
{
- gtk_widget_set_uposition(w, hint_windows[id].ox + x,
+ gtk_window_move(GTK_WINDOW(w), hint_windows[id].ox + x,
hint_windows[id].oy + y);
gtk_widget_show(w);
}
Index: gtkconv.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkconv.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- gtkconv.c 2 Mar 2003 08:10:54 -0000 1.49
+++ gtkconv.c 2 Mar 2003 19:21:27 -0000 1.50
@@ -219,7 +219,7 @@
gtk_widget_show(window);
gaim_gtk_set_state_lock(TRUE);
- gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(gtkconv->toolbar.image),
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtkconv->toolbar.image),
FALSE);
gaim_gtk_set_state_lock(FALSE);
}
@@ -744,7 +744,7 @@
g_signal_connect(G_OBJECT(button), "activate",
G_CALLBACK(menu_im_cb), conv);
g_object_set_data(G_OBJECT(button), "user_data", who);
- gtk_menu_append(GTK_MENU(menu), button);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), button);
gtk_widget_show(button);
if (gaim_chat_is_user_ignored(GAIM_CHAT(conv), who))
@@ -755,7 +755,7 @@
g_signal_connect(G_OBJECT(button), "activate",
G_CALLBACK(ignore_cb), conv);
g_object_set_data(G_OBJECT(button), "user_data", who);
- gtk_menu_append(GTK_MENU(menu), button);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), button);
gtk_widget_show(button);
if (gc && gc->prpl->get_info) {
@@ -763,7 +763,7 @@
g_signal_connect(G_OBJECT(button), "activate",
G_CALLBACK(menu_info_cb), conv);
g_object_set_data(G_OBJECT(button), "user_data", who);
- gtk_menu_append(GTK_MENU(menu), button);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), button);
gtk_widget_show(button);
}
@@ -772,7 +772,7 @@
g_signal_connect(G_OBJECT(button), "activate",
G_CALLBACK(menu_away_cb), conv);
g_object_set_data(G_OBJECT(button), "user_data", who);
- gtk_menu_append(GTK_MENU(menu), button);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), button);
gtk_widget_show(button);
}
@@ -787,11 +787,11 @@
G_CALLBACK(menu_add_cb), conv);
g_object_set_data(G_OBJECT(button), "user_data", who);
- gtk_menu_append(GTK_MENU(menu), button);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), button);
gtk_widget_show(button);
}
/* End Jonas */
-
+
gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL,
event->button, event->time);
}
@@ -2814,7 +2814,6 @@
/* Setup the outer pane. */
vpaned = gtk_vpaned_new();
- gtk_paned_set_gutter_size(GTK_PANED(vpaned), 15);
gtk_widget_show(vpaned);
/* Setup the top part of the pane. */
@@ -2833,14 +2832,13 @@
gtk_widget_show(label);
gtkchat->topic_text = gtk_entry_new();
- gtk_entry_set_editable(GTK_ENTRY(gtkchat->topic_text), FALSE);
+ gtk_editable_set_editable(GTK_EDITABLE(gtkchat->topic_text), FALSE);
gtk_box_pack_start(GTK_BOX(hbox), gtkchat->topic_text, TRUE, TRUE, 5);
gtk_widget_show(gtkchat->topic_text);
}
/* Setup the horizontal pane. */
hpaned = gtk_hpaned_new();
- gtk_paned_set_gutter_size(GTK_PANED(hpaned), 15);
gtk_box_pack_start(GTK_BOX(vbox), hpaned, TRUE, TRUE, 5);
gtk_widget_show(hpaned);
@@ -3029,7 +3027,6 @@
/* Setup the outer pane. */
paned = gtk_vpaned_new();
- gtk_paned_set_gutter_size(GTK_PANED(paned), 15);
gtk_widget_show(paned);
/* Setup the top part of the pane. */
@@ -3193,7 +3190,7 @@
/* Create the window. */
gtkwin->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_role(GTK_WINDOW(gtkwin->window), "conversation");
- gtk_window_set_policy(GTK_WINDOW(gtkwin->window), TRUE, TRUE, FALSE);
+ gtk_window_set_resizable(GTK_WINDOW(gtkwin->window), TRUE);
gtk_container_set_border_width(GTK_CONTAINER(gtkwin->window), 0);
gtk_widget_realize(gtkwin->window);
gtk_window_set_title(GTK_WINDOW(gtkwin->window), _("Conversations"));
@@ -4138,9 +4135,8 @@
if (!GTK_WIDGET_REALIZED(gtkconv->tab_label))
gtk_widget_realize(gtkconv->tab_label);
- gtk_style_set_font(style,
- gdk_font_ref(gtk_style_get_font(gtk_widget_get_style(
- gtkconv->tab_label))));
+ style->font_desc = pango_font_description_copy(
+ gtk_widget_get_style(gtkconv->tab_label)->font_desc);
if (im != NULL && gaim_im_get_typing_state(im) == TYPING) {
style->fg[GTK_STATE_NORMAL].red = 0x4646;
@@ -4168,7 +4164,7 @@
}
gtk_widget_set_style(gtkconv->tab_label, style);
- gtk_style_unref(style);
+ g_object_unref(G_OBJECT(style));
}
else if (type == GAIM_CONV_UPDATE_TOPIC) {
chat = GAIM_CHAT(conv);
@@ -4371,7 +4367,7 @@
gdk_pixbuf_render_pixmap_and_mask(scale, &pm, &bm, 100);
gdk_pixbuf_unref(scale);
- gtk_pixmap_set(GTK_PIXMAP(gtkconv->u.im->icon), pm, bm);
+ gtk_image_set_from_pixmap(GTK_IMAGE(gtkconv->u.im->icon), pm, bm);
gdk_pixmap_unref(pm);
gtk_widget_queue_draw(gtkconv->u.im->icon);
@@ -4583,7 +4579,7 @@
G_CALLBACK(icon_menu), conv);
gtk_widget_show(event);
- gtkconv->u.im->icon = gtk_pixmap_new(pm, bm);
+ gtkconv->u.im->icon = gtk_image_new_from_pixmap(pm, bm);
gtk_widget_set_size_request(gtkconv->u.im->icon, sf, sf);
gtk_container_add(GTK_CONTAINER(event), gtkconv->u.im->icon);
gtk_widget_show(gtkconv->u.im->icon);
Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -d -r1.151 -r1.152
--- gtkimhtml.c 1 Mar 2003 18:37:47 -0000 1.151
+++ gtkimhtml.c 2 Mar 2003 19:21:27 -0000 1.152
@@ -217,25 +217,28 @@
GtkWidget *gtk_imhtml_new(void *a, void *b)
{
- return GTK_WIDGET(gtk_type_new(gtk_imhtml_get_type()));
+ return GTK_WIDGET(g_object_new(gtk_imhtml_get_type(), NULL));
}
-GtkType gtk_imhtml_get_type()
+GType gtk_imhtml_get_type()
{
- static guint imhtml_type = 0;
+ static GType imhtml_type = 0;
if (!imhtml_type) {
- GtkTypeInfo imhtml_info = {
- "GtkIMHtml",
- sizeof (GtkIMHtml),
- sizeof (GtkIMHtmlClass),
- (GtkClassInitFunc) gtk_imhtml_class_init,
- (GtkObjectInitFunc) gtk_imhtml_init,
+ static const GTypeInfo imhtml_info = {
+ sizeof(GtkIMHtmlClass),
NULL,
- NULL
+ NULL,
+ (GClassInitFunc) gtk_imhtml_class_init,
+ NULL,
+ NULL,
+ sizeof (GtkIMHtml),
+ 0,
+ (GInstanceInitFunc) gtk_imhtml_init
};
-
- imhtml_type = gtk_type_unique (gtk_text_view_get_type (), &imhtml_info);
+
+ imhtml_type = g_type_register_static(gtk_text_view_get_type(),
+ "GtkIMHtml", &imhtml_info, 0);
}
return imhtml_type;
Index: log.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/log.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- log.c 22 Jan 2003 23:46:59 -0000 1.6
+++ log.c 2 Mar 2003 19:21:29 -0000 1.7
@@ -82,9 +82,9 @@
}
}
-static void do_save_convo(GtkObject *obj, GtkWidget *wid)
+static void do_save_convo(GObject *obj, GtkWidget *wid)
{
- struct gaim_conversation *c = gtk_object_get_user_data(obj);
+ struct gaim_conversation *c = g_object_get_data(obj, "gaim_conversation");
const char *filename = gtk_file_selection_get_filename(GTK_FILE_SELECTION(wid));
FILE *f;
@@ -118,7 +118,8 @@
GtkWidget *window = gtk_file_selection_new(_("Gaim - Save Conversation"));
g_snprintf(buf, sizeof(buf), "%s" G_DIR_SEPARATOR_S "%s.log", gaim_home_dir(), normalize(c->name));
gtk_file_selection_set_filename(GTK_FILE_SELECTION(window), buf);
- gtk_object_set_user_data(GTK_OBJECT(GTK_FILE_SELECTION(window)->ok_button), c);
+ g_object_set_data(G_OBJECT(GTK_FILE_SELECTION(window)->ok_button),
+ "gaim_conversation", c);
g_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(window)->ok_button),
"clicked", G_CALLBACK(do_save_convo), window);
g_signal_connect_swapped(GTK_OBJECT(GTK_FILE_SELECTION(window)->cancel_button),
Index: main.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/main.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- main.c 19 Feb 2003 23:27:36 -0000 1.6
+++ main.c 2 Mar 2003 19:21:29 -0000 1.7
@@ -230,7 +230,7 @@
{
if (widget == name) {
gtk_entry_set_text(GTK_ENTRY(pass), "");
- gtk_entry_select_region(GTK_ENTRY(GTK_COMBO(name)->entry), 0, 0);
+ gtk_editable_select_region(GTK_EDITABLE(GTK_COMBO(name)->entry), 0, 0);
gtk_widget_grab_focus(pass);
} else if (widget == pass) {
dologin(widget, w);
@@ -302,7 +302,7 @@
mainwindow = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_role(GTK_WINDOW(mainwindow), "login");
- gtk_window_set_policy(GTK_WINDOW(mainwindow), FALSE, FALSE, TRUE);
+ gtk_window_set_resizable(GTK_WINDOW(mainwindow), FALSE);
gtk_window_set_title(GTK_WINDOW(mainwindow), _("Gaim - Login"));
gtk_widget_realize(mainwindow);
gdk_window_set_group(mainwindow->window, mainwindow->window);
Index: multi.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/multi.c,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -d -r1.169 -r1.170
--- multi.c 2 Mar 2003 18:47:58 -0000 1.169
+++ multi.c 2 Mar 2003 19:21:29 -0000 1.170
@@ -245,7 +245,7 @@
static void add_columns(GtkWidget *treeview)
{
GtkCellRenderer *renderer;
- GtkTreeViewColumn *column;
+ /* GtkTreeViewColumn *column; */
/* Screennames */
renderer = gtk_cell_renderer_text_new();
@@ -344,7 +344,7 @@
GtkWidget *button;
struct mod_account_opt *mao = g_new0(struct mod_account_opt, 1);
button = gtk_check_button_new_with_label(text);
- gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(button), (ma->options & option));
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), (ma->options & option));
gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, 0);
mao->ma = ma;
mao->opt = option;
@@ -400,7 +400,7 @@
tmp = ma->opt_entries;
while (tmp) {
GtkEntry *entry = tmp->data;
- int pos = (int)gtk_object_get_user_data(GTK_OBJECT(entry));
+ int pos = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(entry), "position"));
g_snprintf(a->proto_opt[pos], sizeof(a->proto_opt[pos]), "%s",
gtk_entry_get_text(entry));
tmp = tmp->next;
@@ -418,7 +418,9 @@
g_free(ma->account->gpi);
ma->account->gpi = NULL;
- proxytype = (int)gtk_object_get_user_data(GTK_OBJECT(gtk_menu_get_active(GTK_MENU(ma->proxytype_menu))));
+ proxytype = GPOINTER_TO_INT(g_object_get_data(
+ G_OBJECT(gtk_menu_get_active(GTK_MENU(ma->proxytype_menu))),
+ "proxytype"));
if(proxytype != PROXY_USE_GLOBAL) {
struct gaim_proxy_info *gpi = g_new0(struct gaim_proxy_info, 1);
@@ -467,7 +469,7 @@
static void set_prot(GtkWidget *opt, int proto)
{
- struct mod_account *ma = gtk_object_get_user_data(GTK_OBJECT(opt));
+ struct mod_account *ma = g_object_get_data(G_OBJECT(opt), "mod_account");
struct prpl *p, *q;
q = find_prpl(proto);
if (ma->protocol != proto) {
@@ -531,10 +533,10 @@
opt = gtk_menu_item_new_with_label(e->name);
else
opt = gtk_menu_item_new_with_label("Unknown");
- gtk_object_set_user_data(GTK_OBJECT(opt), ma);
+ g_object_set_data(G_OBJECT(opt), "mod_account", ma);
g_signal_connect(GTK_OBJECT(opt), "activate",
G_CALLBACK(set_prot), (void *)e->protocol);
- gtk_menu_append(GTK_MENU(menu), opt);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), opt);
gtk_widget_show(opt);
p = p->next;
}
@@ -630,7 +632,7 @@
name = gtk_entry_new();
gtk_entry_set_text(GTK_ENTRY(name), ma->iconfile);
- gtk_entry_set_editable(GTK_ENTRY(name), FALSE);
+ gtk_editable_set_editable(GTK_EDITABLE(name), FALSE);
gtk_box_pack_start(GTK_BOX(hbox), name, TRUE, TRUE, 5);
gtk_widget_show(name);
ma->iconentry = name;
@@ -831,7 +833,7 @@
entry = gtk_entry_new();
gtk_box_pack_end(GTK_BOX(hbox), entry, FALSE, FALSE, 0);
- gtk_object_set_user_data(GTK_OBJECT(entry), (void *)puo->pos);
+ g_object_set_data(G_OBJECT(entry), "position", GINT_TO_POINTER(puo->pos));
if (ma->proto_opt[puo->pos][0]) {
debug_printf("setting text %s\n", ma->proto_opt[puo->pos]);
gtk_entry_set_text(GTK_ENTRY(entry), ma->proto_opt[puo->pos]);
@@ -847,15 +849,15 @@
if(p->register_user != NULL) {
ma->register_user = gtk_check_button_new_with_label(_("Register with server"));
- gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(ma->register_user), FALSE);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ma->register_user), FALSE);
gtk_box_pack_start(GTK_BOX(vbox), ma->register_user, FALSE, FALSE, 0);
gtk_widget_show(ma->register_user);
}
}
-static void proxy_dropdown_set(GtkObject *w, struct mod_account *ma) {
- int opt = (int)gtk_object_get_user_data(w);
+static void proxy_dropdown_set(GObject *w, struct mod_account *ma) {
+ int opt = GPOINTER_TO_INT(g_object_get_data(w, "proxytype"));
gtk_widget_set_sensitive(ma->proxy_host_box, (opt != PROXY_NONE && opt != PROXY_USE_GLOBAL));
}
@@ -899,7 +901,7 @@
menu = gtk_menu_new();
opt = gtk_menu_item_new_with_label("Use Global Proxy Settings");
- gtk_object_set_user_data(GTK_OBJECT(opt), (gpointer)PROXY_USE_GLOBAL);
+ g_object_set_data(G_OBJECT(opt), "proxytype", GINT_TO_POINTER(PROXY_USE_GLOBAL));
g_signal_connect(G_OBJECT(opt), "activate",
G_CALLBACK(proxy_dropdown_set), ma);
gtk_widget_show(opt);
@@ -908,7 +910,7 @@
gtk_menu_set_active(GTK_MENU(menu), 0);
opt = gtk_menu_item_new_with_label("No Proxy");
- gtk_object_set_user_data(GTK_OBJECT(opt), (gpointer)PROXY_NONE);
+ g_object_set_data(G_OBJECT(opt), "proxytype", GINT_TO_POINTER(PROXY_NONE));
g_signal_connect(G_OBJECT(opt), "activate",
G_CALLBACK(proxy_dropdown_set), ma);
gtk_widget_show(opt);
@@ -917,7 +919,7 @@
gtk_menu_set_active(GTK_MENU(menu), 1);
opt = gtk_menu_item_new_with_label("SOCKS 4");
- gtk_object_set_user_data(GTK_OBJECT(opt), (gpointer)PROXY_SOCKS4);
+ g_object_set_data(G_OBJECT(opt), "proxytype", GINT_TO_POINTER(PROXY_SOCKS4));
g_signal_connect(G_OBJECT(opt), "activate",
G_CALLBACK(proxy_dropdown_set), ma);
gtk_widget_show(opt);
@@ -926,7 +928,7 @@
gtk_menu_set_active(GTK_MENU(menu), 2);
opt = gtk_menu_item_new_with_label("SOCKS 5");
- gtk_object_set_user_data(GTK_OBJECT(opt), (gpointer)PROXY_SOCKS5);
+ g_object_set_data(G_OBJECT(opt), "proxytype", GINT_TO_POINTER(PROXY_SOCKS5));
g_signal_connect(G_OBJECT(opt), "activate",
G_CALLBACK(proxy_dropdown_set), ma);
gtk_widget_show(opt);
@@ -935,7 +937,7 @@
gtk_menu_set_active(GTK_MENU(menu), 3);
opt = gtk_menu_item_new_with_label("HTTP");
- gtk_object_set_user_data(GTK_OBJECT(opt), (gpointer)PROXY_HTTP);
+ g_object_set_data(G_OBJECT(opt), "proxytype", GINT_TO_POINTER(PROXY_HTTP));
g_signal_connect(G_OBJECT(opt), "activate",
G_CALLBACK(proxy_dropdown_set), ma);
gtk_widget_show(opt);
@@ -1078,16 +1080,16 @@
gtk_window_set_role(GTK_WINDOW(ma->mod), "account");
gtk_widget_realize(ma->mod);
gtk_window_set_title(GTK_WINDOW(ma->mod), _("Gaim - Modify Account"));
- gtk_window_set_policy(GTK_WINDOW(ma->mod), FALSE, FALSE, TRUE); /* nothing odd here :) */
+ gtk_window_set_resizable(GTK_WINDOW(ma->mod), FALSE); /* nothing odd here :) */
g_signal_connect(GTK_OBJECT(ma->mod), "destroy", G_CALLBACK(delmod), ma);
vbox = gtk_vbox_new(FALSE, 6);
- gtk_container_border_width(GTK_CONTAINER(vbox), 6);
+ gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
gtk_container_add(GTK_CONTAINER(ma->mod), vbox);
gtk_widget_show(vbox);
ma->main = gtk_vbox_new(FALSE, 12);
- gtk_container_border_width(GTK_CONTAINER(ma->main), 6);
+ gtk_container_set_border_width(GTK_CONTAINER(ma->main), 6);
gtk_box_pack_start(GTK_BOX(vbox), ma->main, FALSE, FALSE, 0);
gtk_widget_show(ma->main);
@@ -1389,7 +1391,7 @@
gtk_window_set_title(GTK_WINDOW(acctedit), _("Gaim - Account Editor"));
gtk_window_set_role(GTK_WINDOW(acctedit), "accounteditor");
gtk_widget_realize(acctedit);
- gtk_widget_set_usize(acctedit, -1, 250);
+ gtk_widget_set_size_request(acctedit, -1, 250);
gtk_window_set_default_size(GTK_WINDOW(acctedit), 550, 250);
g_signal_connect(GTK_OBJECT(acctedit), "delete_event", G_CALLBACK(on_delete_acctedit), W);
@@ -1480,8 +1482,8 @@
GtkWidget *pixmap;
create_prpl_icon (widget, gc, &gdkpixmap, &mask);
-
- pixmap = gtk_pixmap_new (gdkpixmap, mask);
+
+ pixmap = gtk_image_new_from_pixmap(gdkpixmap, mask);
gdk_pixmap_unref (gdkpixmap);
gdk_bitmap_unref (mask);
return pixmap;
@@ -1708,7 +1710,7 @@
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
meter->status = gtk_statusbar_new();
- gtk_widget_set_usize(meter->status, 250, 0);
+ gtk_widget_set_size_request(meter->status, 250, 0);
meter->progress = gtk_progress_bar_new ();
@@ -1751,18 +1753,18 @@
if (!meter_win) {
GtkWidget *cancel_button;
GtkWidget *vbox;
-
+
meter_win = g_new0(struct meter_window, 1);
meter_win->rows=0;
-
+
meter_win->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
GAIM_DIALOG(meter_win->window);
- gtk_window_set_policy(GTK_WINDOW(meter_win->window), 0, 0, 1);
+ gtk_window_set_resizable(GTK_WINDOW(meter_win->window), FALSE);
gtk_window_set_role(GTK_WINDOW(meter_win->window), "signon");
gtk_container_set_border_width(GTK_CONTAINER(meter_win->window), 5);
gtk_window_set_title (GTK_WINDOW (meter_win->window), _("Gaim Account Signon"));
gtk_widget_realize(meter_win->window);
-
+
vbox = gtk_vbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER (meter_win->window), GTK_WIDGET (vbox));
Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.332
retrieving revision 1.333
diff -u -d -r1.332 -r1.333
--- prefs.c 2 Mar 2003 18:47:59 -0000 1.332
+++ prefs.c 2 Mar 2003 19:21:30 -0000 1.333
@@ -45,9 +45,7 @@
#endif
GtkWidget *tree_v = NULL;
-GtkWidget *prefs_away_list = NULL;
GtkWidget *prefs_away_menu = NULL;
-GtkWidget *preftree = NULL;
GtkWidget *fontseld = NULL;
GtkListStore *prefs_away_store = NULL;
@@ -60,8 +58,6 @@
static GtkWidget *sound_entry = NULL;
static GtkWidget *away_text = NULL;
static GtkListStore *smiley_theme_store = NULL;
-GtkCTreeNode *general_node = NULL;
-GtkCTreeNode *deny_node = NULL;
GtkWidget *prefs_proxy_frame = NULL;
GtkWidget *gaim_button(const char *, guint *, int, GtkWidget *);
GtkWidget *gaim_labeled_spin_button(GtkWidget *, const gchar *, int*, int, int, GtkSizeGroup *);
@@ -99,6 +95,7 @@
if(sounddialog)
gtk_widget_destroy(sounddialog);
g_object_unref(G_OBJECT(prefs_away_store));
+ prefs_away_store = NULL;
while(l) {
plug = l->data;
if(plug->iter) {
@@ -1013,7 +1010,7 @@
sndcmd = gtk_entry_new();
gtk_label_set_mnemonic_widget(GTK_LABEL(label), sndcmd);
- gtk_entry_set_editable(GTK_ENTRY(sndcmd), TRUE);
+ gtk_editable_set_editable(GTK_EDITABLE(sndcmd), TRUE);
cmd = gaim_sound_get_command();
if(cmd)
gtk_entry_set_text(GTK_ENTRY(sndcmd), cmd);
@@ -1525,7 +1522,7 @@
sound_entry = gtk_entry_new();
file = gaim_sound_get_event_file(0);
gtk_entry_set_text(GTK_ENTRY(sound_entry), file ? file : "(default)");
- gtk_entry_set_editable(GTK_ENTRY(sound_entry), FALSE);
+ gtk_editable_set_editable(GTK_EDITABLE(sound_entry), FALSE);
gtk_box_pack_start(GTK_BOX(hbox), sound_entry, FALSE, FALSE, 5);
button = gtk_button_new_with_label(_("Test"));
@@ -1763,11 +1760,11 @@
gtk_window_set_role(GTK_WINDOW(prefs), "preferences");
gtk_widget_realize(prefs);
gtk_window_set_title(GTK_WINDOW(prefs), _("Gaim - Preferences"));
- gtk_window_set_policy (GTK_WINDOW(prefs), FALSE, FALSE, TRUE);
+ gtk_window_set_resizable (GTK_WINDOW(prefs), FALSE);
g_signal_connect(GTK_OBJECT(prefs), "destroy", G_CALLBACK(delete_prefs), NULL);
vbox = gtk_vbox_new(FALSE, 5);
- gtk_container_border_width(GTK_CONTAINER(vbox), 5);
+ gtk_container_set_border_width(GTK_CONTAINER(vbox), 5);
gtk_container_add(GTK_CONTAINER(prefs), vbox);
gtk_widget_show(vbox);
@@ -2064,9 +2061,9 @@
{
GtkWidget *button;
button = gtk_check_button_new_with_mnemonic(text);
- gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(button), (*options & option));
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), (*options & option));
gtk_box_pack_start(GTK_BOX(page), button, FALSE, FALSE, 0);
- gtk_object_set_user_data(GTK_OBJECT(button), options);
+ g_object_set_data(G_OBJECT(button), "options", options);
if (options == &misc_options) {
g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(set_misc_option),
@@ -2103,8 +2100,6 @@
return button;
}
-void away_list_clicked(GtkWidget *widget, struct away_message *a)
-{}
void default_away_menu_init(GtkWidget *omenu)
{
GtkWidget *menu, *opt;
@@ -2120,7 +2115,7 @@
g_signal_connect(GTK_OBJECT(opt), "activate", G_CALLBACK(set_default_away),
(gpointer)index);
gtk_widget_show(opt);
- gtk_menu_append(GTK_MENU(menu), opt);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), opt);
awy = awy->next;
index++;
@@ -2238,7 +2233,7 @@
static void update_spin_value(GtkWidget *w, GtkWidget *spin)
{
- int *value = gtk_object_get_user_data(GTK_OBJECT(spin));
+ int *value = g_object_get_data(G_OBJECT(spin), "val");
*value = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin));
}
@@ -2259,8 +2254,8 @@
adjust = gtk_adjustment_new(*val, min, max, 1, 1, 1);
spin = gtk_spin_button_new(GTK_ADJUSTMENT(adjust), 1, 0);
- gtk_object_set_user_data(GTK_OBJECT(spin), val);
- gtk_widget_set_usize(spin, 50, -1);
+ g_object_set_data(G_OBJECT(spin), "val", val);
+ gtk_widget_set_size_request(spin, 50, -1);
gtk_box_pack_start(GTK_BOX(hbox), spin, FALSE, FALSE, 0);
g_signal_connect(GTK_OBJECT(adjust), "value-changed",
G_CALLBACK(update_spin_value), GTK_WIDGET(spin));
@@ -2276,10 +2271,10 @@
return label;
}
-void dropdown_set(GtkObject *w, int *option)
+void dropdown_set(GObject *w, int *option)
{
- int opt = (int)gtk_object_get_user_data(w);
- int clear = (int)gtk_object_get_data(w, "clear");
+ int opt = GPOINTER_TO_INT(g_object_get_data(w, "value"));
+ int clear = GPOINTER_TO_INT(g_object_get_data(w, "clear"));
if (clear != -1) {
*option = *option & ~clear;
@@ -2381,8 +2376,8 @@
menuitems = g_list_next(menuitems);
opt = gtk_menu_item_new_with_label(text);
- gtk_object_set_user_data(GTK_OBJECT(opt), (void *)value);
- gtk_object_set_data(GTK_OBJECT(opt), "clear", (void *)clear);
+ g_object_set_data(G_OBJECT(opt), "value", GINT_TO_POINTER(value));
+ g_object_set_data(G_OBJECT(opt), "clear", GINT_TO_POINTER(clear));
g_signal_connect(GTK_OBJECT(opt), "activate",
G_CALLBACK(dropdown_set), (void *)option);
gtk_widget_show(opt);
@@ -2436,7 +2431,7 @@
swid = gtk_event_box_new();
gtk_widget_set_style(GTK_WIDGET(swid), style);
g_object_unref(style);
- gtk_widget_set_usize(GTK_WIDGET(swid), 40, -1);
+ gtk_widget_set_size_request(GTK_WIDGET(swid), 40, -1);
gtk_box_pack_start(GTK_BOX(box), swid, FALSE, FALSE, 5);
gtk_widget_show(swid);
return swid;
@@ -2457,7 +2452,7 @@
fontface[i] = 0;
g_free(fontname);
-
+
gaim_conversation_foreach(gaim_gtkconv_update_font_face);
}
Index: prpl.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prpl.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- prpl.c 8 Feb 2003 00:26:16 -0000 1.87
+++ prpl.c 2 Mar 2003 19:21:32 -0000 1.88
@@ -279,7 +279,7 @@
GAIM_DIALOG(window);
p->window = window;
gtk_window_set_role(GTK_WINDOW(window), "prompt");
- gtk_window_set_policy(GTK_WINDOW(window), FALSE, TRUE, TRUE);
+ gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
gtk_window_set_title(GTK_WINDOW(window), _("Gaim - Prompt"));
g_signal_connect(GTK_OBJECT(window), "destroy", G_CALLBACK(des_prompt), p);
gtk_widget_realize(window);
@@ -335,10 +335,10 @@
if (!protomenu)
return;
- l = gtk_container_children(GTK_CONTAINER(protomenu));
+ l = gtk_container_get_children(GTK_CONTAINER(protomenu));
while (l) {
menuitem = l->data;
- pam = gtk_object_get_data(GTK_OBJECT(menuitem), "user_data");
+ pam = g_object_get_data(G_OBJECT(menuitem), "proto_actions_menu");
if (pam)
g_free(pam);
gtk_container_remove(GTK_CONTAINER(protomenu), GTK_WIDGET(menuitem));
@@ -356,7 +356,7 @@
if (!count) {
g_snprintf(buf, sizeof(buf), _("No actions available"));
menuitem = gtk_menu_item_new_with_label(buf);
- gtk_menu_append(GTK_MENU(protomenu), menuitem);
+ gtk_menu_shell_append(GTK_MENU_SHELL(protomenu), menuitem);
gtk_widget_show(menuitem);
return;
}
@@ -376,10 +376,10 @@
if (act->data) {
struct proto_actions_menu *pam = act->data;
menuitem = gtk_menu_item_new_with_label(pam->label);
- gtk_menu_append(GTK_MENU(protomenu), menuitem);
+ gtk_menu_shell_append(GTK_MENU_SHELL(protomenu), menuitem);
g_signal_connect(GTK_OBJECT(menuitem), "activate",
G_CALLBACK(proto_act), pam);
- gtk_object_set_data(GTK_OBJECT(menuitem), "user_data", pam);
+ g_object_set_data(G_OBJECT(menuitem), "proto_actions_menu", pam);
gtk_widget_show(menuitem);
} else {
gaim_separator(protomenu);
@@ -397,7 +397,7 @@
g_snprintf(buf, sizeof(buf), "%s (%s)", gc->username, gc->prpl->name);
menuitem = gtk_menu_item_new_with_label(buf);
- gtk_menu_append(GTK_MENU(protomenu), menuitem);
+ gtk_menu_shell_append(GTK_MENU_SHELL(protomenu), menuitem);
gtk_widget_show(menuitem);
submenu = gtk_menu_new();
@@ -410,10 +410,11 @@
if (act->data) {
struct proto_actions_menu *pam = act->data;
menuitem = gtk_menu_item_new_with_label(pam->label);
- gtk_menu_append(GTK_MENU(submenu), menuitem);
+ gtk_menu_shell_append(GTK_MENU_SHELL(submenu), menuitem);
g_signal_connect(GTK_OBJECT(menuitem), "activate",
G_CALLBACK(proto_act), pam);
- gtk_object_set_data(GTK_OBJECT(menuitem), "user_data", pam);
+ g_object_set_data(G_OBJECT(menuitem), "proto_actions_menu",
+ pam);
gtk_widget_show(menuitem);
} else {
gaim_separator(submenu);
@@ -498,7 +499,7 @@
GAIM_DIALOG(mn->email_win);
gtk_window_set_role(GTK_WINDOW(mn->email_win), "mail");
- gtk_window_set_policy(GTK_WINDOW(mn->email_win), FALSE, TRUE, TRUE);
+ gtk_window_set_resizable(GTK_WINDOW(mn->email_win), TRUE);
gtk_window_set_title(GTK_WINDOW(mn->email_win), _("Gaim - New Mail"));
g_signal_connect(GTK_OBJECT(mn->email_win), "destroy", G_CALLBACK(des_email_win), mn);
gtk_widget_realize(mn->email_win);
Index: server.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/server.c,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -d -r1.278 -r1.279
--- server.c 24 Feb 2003 00:29:52 -0000 1.278
+++ server.c 2 Mar 2003 19:21:32 -0000 1.279
@@ -1175,7 +1175,7 @@
static void des_popup(GtkWidget *w, GtkWidget *window)
{
if (w == window) {
- char *u = gtk_object_get_user_data(GTK_OBJECT(window));
+ char *u = g_object_get_data(G_OBJECT(window), "url");
g_free(u);
}
gtk_widget_destroy(window);
@@ -1193,18 +1193,18 @@
GAIM_DIALOG(window);
gtk_window_set_role(GTK_WINDOW(window), "popup");
- gtk_window_set_policy(GTK_WINDOW(window), FALSE, FALSE, TRUE);
+ gtk_window_set_resizable(GTK_WINDOW(window), FALSE);
gtk_window_set_title(GTK_WINDOW(window), "Gaim - Popup");
gtk_container_set_border_width(GTK_CONTAINER(window), 5);
g_signal_connect(GTK_OBJECT(window), "destroy", G_CALLBACK(des_popup), window);
- gtk_object_set_user_data(GTK_OBJECT(window), url);
+ g_object_set_data(G_OBJECT(window), "url", url);
gtk_widget_realize(window);
vbox = gtk_vbox_new(FALSE, 5);
gtk_container_add(GTK_CONTAINER(window), vbox);
sw = gtk_scrolled_window_new(NULL, NULL);
- gtk_widget_set_usize(sw, wid, hei);
+ gtk_widget_set_size_request(sw, wid, hei);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 5);
Index: ui.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/ui.h,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- ui.h 24 Feb 2003 00:29:52 -0000 1.92
+++ ui.h 2 Mar 2003 19:21:33 -0000 1.93
@@ -486,7 +486,7 @@
extern void build_allow_list();
extern void build_block_list();
extern GtkWidget *make_frame(GtkWidget *, char *);
-extern GtkWidget *prefs_away_list;
+extern GtkListStore *prefs_away_store;
extern GtkWidget *prefs_away_menu;
extern GtkWidget *pref_fg_picture;
extern GtkWidget *pref_bg_picture;
Index: util.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/util.c,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -d -r1.159 -r1.160
--- util.c 31 Jan 2003 13:03:44 -0000 1.159
+++ util.c 2 Mar 2003 19:21:35 -0000 1.160
@@ -1126,11 +1126,11 @@
if (icon == NULL)
menuitem = gtk_menu_item_new_with_mnemonic(str);
- else
+ else
menuitem = gtk_image_menu_item_new_with_mnemonic(str);
if (menu)
- gtk_menu_append(GTK_MENU(menu), menuitem);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
if (sf)
g_signal_connect(GTK_OBJECT(menuitem), "activate", sf, data);
@@ -1173,7 +1173,7 @@
menuitem = gtk_image_menu_item_new_with_mnemonic(_(str));
if (menu)
- gtk_menu_append(GTK_MENU(menu), menuitem);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
if (sf)
g_signal_connect(GTK_OBJECT(menuitem), "activate", sf, data);
@@ -1218,7 +1218,7 @@
menuitem = gtk_menu_item_new();
if (menu)
- gtk_menu_append(GTK_MENU(menu), menuitem);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
if (sf)
/* passing 1 is necessary so if we sign off closing the account editor doesn't exit */
g_signal_connect(GTK_OBJECT(menuitem), "activate", sf, data);
@@ -1232,7 +1232,7 @@
/* Create our pixmap and pack it */
gtk_widget_realize(menu->parent);
pm = gdk_pixmap_create_from_xpm_d(menu->parent->window, &mask, NULL, xpm);
- pixmap = gtk_pixmap_new(pm, mask);
+ pixmap = gtk_image_new_from_pixmap(pm, mask);
gtk_widget_show(pixmap);
gdk_pixmap_unref(pm);
gdk_bitmap_unref(mask);
@@ -1264,7 +1264,7 @@
menuitem = gtk_menu_item_new();
if (menu)
- gtk_menu_append(GTK_MENU(menu), menuitem);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
gtk_widget_show(menuitem);
label = gtk_label_new(str);
|
