diff src/dialogs.c @ 3374:3cd2fbddf95a

[gaim-migrate @ 3393] I had terrible days today and yesterday--a really terrible weekend. No cool stuff from me--the prefs away message page works a bit better. Ari and Chip both sent some patches to make things work a bit better in GTK 2, and Etan rewrote the notify plugin so it's really cool now! Thanks, guys! committer: Tailor Script <tailor@pidgin.im>
author Sean Egan <seanegan@gmail.com>
date Mon, 05 Aug 2002 07:33:09 +0000
parents 3b00d97d59aa
children 8fa61405af2b
line wrap: on
line diff
--- a/src/dialogs.c	Fri Aug 02 21:25:34 2002 +0000
+++ b/src/dialogs.c	Mon Aug 05 07:33:09 2002 +0000
@@ -556,7 +556,30 @@
 	GtkWidget *d;
 	GtkWidget *label;
 	GtkWidget *close;
-
+	GtkWidget *img = NULL;
+	/*
+#if GTK_CHECK_VERSION(1,3,0)
+	char *filename;
+	switch (type){
+	case GAIM_LOGO:
+		filename = g_build_filename(DATADIR, "pixmaps", "gaim", "gaim.png", NULL);
+		break;
+	case GAIM_INFO:
+		filename = g_build_filename(DATADIR, "pixmaps", "gaim", "dialogs", "gaim_info.png", NULL);
+		break;
+	case GAIM_WARNING:
+		filename = g_build_filename(DATADIR, "pixmaps", "gaim", "dialogs", "gaim_warning.png", NULL);
+		break;
+	case GAIM_ERROR:
+		filename = g_build_filename(DATADIR, "pixmaps", "gaim", "dialogs", "gaim_error.png", NULL);
+		break;
+	case GAIM_QUESTION:
+		filename = g_build_filename(DATADIR, "pixmaps", "gaim", "dialogs", "gaim_question.png", NULL);
+		break;
+	}
+	img = gtk_image_new_from_file(filename);
+#endif
+	*/
 
 	d = gtk_dialog_new();
 	gtk_window_set_policy(GTK_WINDOW(d), FALSE, FALSE, TRUE);
@@ -3524,7 +3547,27 @@
 	gtk_container_add(GTK_CONTAINER(sw), ca->text);
 	gtk_widget_show(ca->text);
 
-	if (dummy && GTK_LIST(prefs_away_list)->selection) {
+       
+#if GTK_CHECK_VERSION(1,3,0)
+	if (dummy) {
+		struct away_message *amt;
+		GtkTreeIter iter;
+		int pos = 0;
+		GtkListStore *ls = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(dummy)));
+		GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(dummy));
+		GValue val = { 0, };
+
+		if (! gtk_tree_selection_get_selected (sel, &ls, &iter))
+			return;
+		gtk_tree_model_get_value (ls, &iter, 1, &val);
+		amt = g_value_get_pointer (&val);
+		gtk_entry_set_text(GTK_ENTRY(ca->entry), amt->name);
+		gtk_editable_insert_text(GTK_EDITABLE(ca->text), amt->message,
+					 strlen(amt->message), &pos);
+		ca->mess = amt;
+	}
+#else
+	if (dummy && GTK_LIST(prefs_away_list)->selection) {	
 		GtkWidget *item = GTK_LIST(prefs_away_list)->selection->data;
 		struct away_message *amt = gtk_object_get_user_data(GTK_OBJECT(item));
 		int pos = 0;
@@ -3533,6 +3576,8 @@
 					 strlen(amt->message), &pos);
 		ca->mess = amt;
 	}
+#endif	
+	
 
 	hbox = gtk_hbox_new(FALSE, 5);
 	gtk_box_pack_start(GTK_BOX(tbox), hbox, FALSE, FALSE, 0);