From: Mark D. <the...@us...> - 2003-09-29 22:34:36
|
Update of /cvsroot/gaim/gaim/src In directory sc8-pr-cvs1:/tmp/cvs-serv3011/src Modified Files: server.c server.h Log Message: -Made AIM over oscar show the away message in the second line of the big blist. For the record, I'm against this because I think it's really ugly. What are yous guys opinions? -Changed the last g_show_info_text() in oscar.c to gaim_notify_formatted() -Made oscar gaim_popup() use gaim_notify_formatted() instead of serv_got_popup() -Removed serv_got_popup(), des_popup(), and url_clicked_cb() Index: server.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/server.c,v retrieving revision 1.370 retrieving revision 1.371 diff -u -d -p -r1.370 -r1.371 --- server.c 27 Sep 2003 19:17:19 -0000 1.370 +++ server.c 29 Sep 2003 22:34:31 -0000 1.371 @@ -1500,69 +1500,3 @@ void serv_got_chat_in(GaimConnection *g, g_free(buf); g_free(buffy); } - -static void des_popup(GtkWidget *w, GtkWidget *window) -{ - if (w == window) { - char *u = g_object_get_data(G_OBJECT(window), "url"); - g_free(u); - } - gtk_widget_destroy(window); -} - -static void -url_clicked_cb(GtkWidget *w, const char *uri) -{ - gaim_notify_uri(NULL, uri); -} - -void serv_got_popup(const char *msg, const char *u, int wid, int hei) -{ - GtkWidget *window; - GtkWidget *vbox; - GtkWidget *sw; - GtkWidget *text; - GtkWidget *hbox; - GtkWidget *button; - char *url = g_strdup(u); - - GAIM_DIALOG(window); - gtk_window_set_role(GTK_WINDOW(window), "popup"); - 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(G_OBJECT(window), "destroy", - G_CALLBACK(des_popup), window); - 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_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); - - text = gtk_imhtml_new(NULL, NULL); - gtk_container_add(GTK_CONTAINER(sw), text); - gaim_setup_imhtml(text); - - hbox = gtk_hbox_new(FALSE, 5); - gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 5); - - button = gaim_pixbuf_button_from_stock(_("Close"), GTK_STOCK_CLOSE, GAIM_BUTTON_HORIZONTAL); - gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 5); - g_signal_connect(G_OBJECT(button), "clicked", - G_CALLBACK(des_popup), window); - - button = gaim_pixbuf_button_from_stock(_("More Info"), GTK_STOCK_FIND, GAIM_BUTTON_HORIZONTAL); - gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 5); - g_signal_connect(G_OBJECT(button), "clicked", - G_CALLBACK(url_clicked_cb), url); - - gtk_widget_show_all(window); - - gtk_imhtml_append_text(GTK_IMHTML(text), msg, GTK_IMHTML_NO_NEWLINE); -} - Index: server.h =================================================================== RCS file: /cvsroot/gaim/gaim/src/server.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -p -r1.10 -r1.11 --- server.h 27 Sep 2003 19:17:19 -0000 1.10 +++ server.h 29 Sep 2003 22:34:31 -0000 1.11 @@ -70,7 +70,6 @@ void serv_chat_invite(GaimConnection *, void serv_chat_leave(GaimConnection *, int); void serv_chat_whisper(GaimConnection *, int, const char *, const char *); int serv_chat_send(GaimConnection *, int, const char *); -void serv_got_popup(const char *, const char *, int, int); void serv_get_away(GaimConnection *, const char *); void serv_alias_buddy(GaimBuddy *); void serv_got_alias(GaimConnection *gc, const char *who, const char *alias); |