[Gaim-commits] CVS: gaim/src dialogs.c,1.541,1.542 gaim.h,1.411,1.412

[Christian H. <ch...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv18174

Modified Files:
	dialogs.c gaim.h 
Log Message:
Removed show_set_dir() and replaced show_find_email() in oscar.


Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.541
retrieving revision 1.542
diff -u -d -p -r1.541 -r1.542
--- dialogs.c	30 Sep 2003 20:13:22 -0000	1.541
+++ dialogs.c	30 Sep 2003 22:41:01 -0000	1.542
@@ -831,189 +831,6 @@ void do_save_info(GtkWidget *widget, str
 	g_free(b);
 }
 
-void do_set_dir(GtkWidget *widget, struct set_dir_dlg *b)
-{
-	const char *first = gtk_entry_get_text(GTK_ENTRY(b->first));
-	int web = GTK_TOGGLE_BUTTON(b->web)->active;
-	const char *middle = gtk_entry_get_text(GTK_ENTRY(b->middle));
-	const char *last = gtk_entry_get_text(GTK_ENTRY(b->last));
-	const char *maiden = gtk_entry_get_text(GTK_ENTRY(b->maiden));
-	const char *city = gtk_entry_get_text(GTK_ENTRY(b->city));
-	const char *state = gtk_entry_get_text(GTK_ENTRY(b->state));
-	const char *country = gtk_entry_get_text(GTK_ENTRY(b->country));
-
-	serv_set_dir(b->gc, first, middle, last, maiden, city, state, country, web);
-
-	destroy_dialog(NULL, b->window);
-	g_free(b);
-}
-
-void show_set_dir(GaimConnection *gc)
-{
-	GaimAccount *account;
-	GtkWidget *label;
-	GtkWidget *bot;
-	GtkWidget *vbox;
-	GtkWidget *hbox;
-	GtkWidget *frame;
-	GtkWidget *fbox;
-	char buf[256];
-
-	struct set_dir_dlg *b = g_new0(struct set_dir_dlg, 1);
-
-	b->gc = gc;
-
-	account = gaim_connection_get_account(gc);
-
-	GAIM_DIALOG(b->window);
-	dialogwindows = g_list_prepend(dialogwindows, b->window);
-	gtk_window_set_role(GTK_WINDOW(b->window), "set_dir");
-	gtk_window_set_resizable(GTK_WINDOW(b->window), TRUE);
-	gtk_window_set_title(GTK_WINDOW(b->window), _("Set Directory Info"));
-	g_signal_connect(G_OBJECT(b->window), "destroy", G_CALLBACK(destroy_dialog), b->window);
-	gtk_widget_realize(b->window);
-
-	fbox = gtk_vbox_new(FALSE, 5);
-	gtk_container_add(GTK_CONTAINER(b->window), fbox);
-	gtk_widget_show(fbox);
-
-	frame = gtk_frame_new(_("Directory Info"));
-	gtk_container_set_border_width(GTK_CONTAINER(fbox), 5);
-	gtk_box_pack_start(GTK_BOX(fbox), frame, FALSE, FALSE, 0);
-	gtk_widget_show(frame);
-
-	vbox = gtk_vbox_new(FALSE, 5);
-	gtk_container_set_border_width(GTK_CONTAINER(vbox), 5);
-	gtk_container_add(GTK_CONTAINER(frame), vbox);
-	gtk_widget_show(vbox);
-
-	g_snprintf(buf, sizeof(buf), _("Setting Dir Info for %s:"),
-			   gaim_account_get_username(account));
-	label = gtk_label_new(buf);
-	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 5);
-	gtk_widget_show(label);
-
-	b->first = gtk_entry_new();
-	b->middle = gtk_entry_new();
-	b->last = gtk_entry_new();
-	b->maiden = gtk_entry_new();
-	b->city = gtk_entry_new();
-	b->state = gtk_entry_new();
-	b->country = gtk_entry_new();
-	b->web = gtk_check_button_new_with_label(_("Allow Web Searches To Find Your Info"));
-
-	/* Line 1 */
-	label = gtk_label_new(_("First Name"));
-	gtk_widget_show(label);
-
-	hbox = gtk_hbox_new(FALSE, 5);
-	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-	gtk_box_pack_end(GTK_BOX(hbox), b->first, FALSE, FALSE, 0);
-
-	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-	gtk_widget_show(hbox);
-
-	/* Line 2 */
-	label = gtk_label_new(_("Middle Name"));
-	gtk_widget_show(label);
-
-	hbox = gtk_hbox_new(FALSE, 5);
-	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-	gtk_box_pack_end(GTK_BOX(hbox), b->middle, FALSE, FALSE, 0);
-
-	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-	gtk_widget_show(hbox);
-
-
-	/* Line 3 */
-	label = gtk_label_new(_("Last Name"));
-	gtk_widget_show(label);
-
-	hbox = gtk_hbox_new(FALSE, 5);
-	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-	gtk_box_pack_end(GTK_BOX(hbox), b->last, FALSE, FALSE, 0);
-
-	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-	gtk_widget_show(hbox);
-
-	/* Line 4 */
-	label = gtk_label_new(_("Maiden Name"));
-	gtk_widget_show(label);
-
-	hbox = gtk_hbox_new(FALSE, 5);
-	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-	gtk_box_pack_end(GTK_BOX(hbox), b->maiden, FALSE, FALSE, 0);
-
-	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-	gtk_widget_show(hbox);
-
-	/* Line 5 */
-	label = gtk_label_new(_("City"));
-	gtk_widget_show(label);
-
-	hbox = gtk_hbox_new(FALSE, 5);
-	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-	gtk_box_pack_end(GTK_BOX(hbox), b->city, FALSE, FALSE, 0);
-
-	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-	gtk_widget_show(hbox);
-
-	/* Line 6 */
-	label = gtk_label_new(_("State"));
-	gtk_widget_show(label);
-
-	hbox = gtk_hbox_new(FALSE, 5);
-	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-	gtk_box_pack_end(GTK_BOX(hbox), b->state, FALSE, FALSE, 0);
-
-	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-	gtk_widget_show(hbox);
-
-	/* Line 7 */
-	label = gtk_label_new(_("Country"));
-	gtk_widget_show(label);
-
-	hbox = gtk_hbox_new(FALSE, 5);
-	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-	gtk_box_pack_end(GTK_BOX(hbox), b->country, FALSE, FALSE, 0);
-
-	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-	gtk_widget_show(hbox);
-
-	/* Line 8 */
-
-	hbox = gtk_hbox_new(FALSE, 5);
-	gtk_box_pack_start(GTK_BOX(hbox), b->web, TRUE, TRUE, 0);
-	gtk_widget_show(hbox);
-	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-
-	gtk_widget_show(b->first);
-	gtk_widget_show(b->middle);
-	gtk_widget_show(b->last);
-	gtk_widget_show(b->maiden);
-	gtk_widget_show(b->city);
-	gtk_widget_show(b->state);
-	gtk_widget_show(b->country);
-	gtk_widget_show(b->web);
-
-	/* And add the buttons */
-
-	bot = gtk_hbox_new(FALSE, 5);
-	gtk_box_pack_start(GTK_BOX(fbox), bot, FALSE, FALSE, 0);
-
-	b->save = gaim_pixbuf_button_from_stock(_("Save"), GTK_STOCK_SAVE, GAIM_BUTTON_HORIZONTAL);
-	gtk_box_pack_end(GTK_BOX(bot), b->save, FALSE, FALSE, 0);
-	g_signal_connect(G_OBJECT(b->save), "clicked", G_CALLBACK(do_set_dir), b);
-
-	b->cancel = gaim_pixbuf_button_from_stock(_("Cancel"), GTK_STOCK_CANCEL, GAIM_BUTTON_HORIZONTAL);
-	gtk_box_pack_end(GTK_BOX(bot), b->cancel, FALSE, FALSE, 0);
-	g_signal_connect(G_OBJECT(b->cancel), "clicked", G_CALLBACK(destroy_dialog), b->window);
-
-	gtk_window_set_focus(GTK_WINDOW(b->window), b->first);
-
-	gtk_widget_show_all(b->window);
-}
-
 void show_set_info(GaimConnection *gc)
 {
 	GtkWidget *buttons;
@@ -1194,17 +1011,6 @@ void do_find_info(GtkWidget *w, struct f
 	destroy_dialog(NULL, b->window);
 }
 
-void do_find_email(GtkWidget *w, struct findbyemail *b)
-{
-	const char *email;
-
-	email = gtk_entry_get_text(GTK_ENTRY(b->emailentry));
-
-	serv_dir_search(b->gc, "", "", "", "", "", "", "", email);
-
-	destroy_dialog(NULL, b->window);
-}
-
 void show_find_info(GaimConnection *gc)
 {
 	GtkWidget *cancel;
@@ -1329,59 +1135,6 @@ void show_find_info(GaimConnection *gc)
 	gtk_container_add(GTK_CONTAINER(b->window), fbox);
 	gtk_container_set_border_width(GTK_CONTAINER(b->window), 5);
 	gtk_widget_realize(b->window);
-
-	gtk_widget_show_all(b->window);
-}
-
-void show_find_email(GaimConnection *gc)
-{
-	GtkWidget *label;
-	GtkWidget *bbox;
-	GtkWidget *vbox;
-	GtkWidget *frame;
-	GtkWidget *topbox;
-	GtkWidget *button;
-
-	struct findbyemail *b = g_new0(struct findbyemail, 1);
-	if (g_list_find(gaim_connections_get_all(), gc))
-		b->gc = gc;
-	GAIM_DIALOG(b->window);
-	gtk_window_set_resizable(GTK_WINDOW(b->window), TRUE);
-	gtk_window_set_role(GTK_WINDOW(b->window), "find_email");
-	gtk_widget_realize(b->window);
-	dialogwindows = g_list_prepend(dialogwindows, b->window);
-	g_signal_connect(G_OBJECT(b->window), "destroy", G_CALLBACK(destroy_dialog), b->window);
-	gtk_window_set_title(GTK_WINDOW(b->window), _("Find Buddy By Email"));
-
-	vbox = gtk_vbox_new(FALSE, 5);
-	gtk_container_set_border_width(GTK_CONTAINER(vbox), 5);
-	gtk_container_add(GTK_CONTAINER(b->window), vbox);
-
-	frame = gtk_frame_new(_("Search for Buddy"));
-	gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0);
-
-	topbox = gtk_hbox_new(FALSE, 5);
-	gtk_container_add(GTK_CONTAINER(frame), topbox);
-	gtk_container_set_border_width(GTK_CONTAINER(topbox), 5);
-
-	label = gtk_label_new(_("Email"));
-	gtk_box_pack_start(GTK_BOX(topbox), label, FALSE, FALSE, 0);
-
-	b->emailentry = gtk_entry_new();
-	gtk_box_pack_start(GTK_BOX(topbox), b->emailentry, TRUE, TRUE, 0);
-	g_signal_connect(G_OBJECT(b->emailentry), "activate", G_CALLBACK(do_find_email), b);
-	gtk_window_set_focus(GTK_WINDOW(b->window), b->emailentry);
-
-	bbox = gtk_hbox_new(FALSE, 5);
-	gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
-
-	button = gaim_pixbuf_button_from_stock(_("OK"), GTK_STOCK_OK, GAIM_BUTTON_HORIZONTAL);
-	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(do_find_email), b);
-	gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0);
-
-	button = gaim_pixbuf_button_from_stock(_("Cancel"), GTK_STOCK_CANCEL, GAIM_BUTTON_HORIZONTAL);
-	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(destroy_dialog), b->window);
-	gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0);
 
 	gtk_widget_show_all(b->window);
 }

Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.411
retrieving revision 1.412
diff -u -d -p -r1.411 -r1.412
--- gaim.h	30 Sep 2003 08:08:33 -0000	1.411
+++ gaim.h	30 Sep 2003 22:41:01 -0000	1.412
@@ -37,8 +37,6 @@ extern GSList *unread_message_queue;
 extern GSList *away_time_queue;
 
 /* Functions in dialogs.c */
-extern void show_set_dir(GaimConnection *);
-extern void show_find_email(GaimConnection *);
 extern void show_find_info(GaimConnection *);
 extern void show_confirm_del(GaimBuddy *);
 extern void show_confirm_del_group(GaimGroup *);