From 1fe60aabdf9eea37611d7670134b777d510caad2 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Tue, 2 Jul 2019 15:54:13 +0200 Subject: [PATCH] p2v: remove non-author credits Soon only the virt-p2v authors will be available, so remove all the other roles. This leaves only in the virt-p2v about dialog, which is a mild regression compared to the current situation, although it is just for user information. --- generator/authors.ml | 15 --------------- p2v/gui-gtk3-compat.h | 5 ----- p2v/gui.c | 13 ------------- 3 files changed, 33 deletions(-) diff --git a/generator/authors.ml b/generator/authors.ml index 730eb5039..14403c624 100644 --- a/generator/authors.ml +++ b/generator/authors.ml @@ -170,21 +170,6 @@ let generate_p2v_about_authors_c () = pr "const char *authors[] = {\n"; List.iter fn authors; pr " NULL\n"; - pr "};\n\n"; - pr "/* Libguestfs quality assurance (if not included above). */\n"; - pr "const char *qa[] = {\n"; - List.iter fn qa; - pr " NULL\n"; - pr "};\n\n"; - pr "/* Libguestfs documentation (if not included above). */\n"; - pr "const char *documenters[] = {\n"; - List.iter fn documenters; - pr " NULL\n"; - pr "};\n\n"; - pr "/* Libguestfs developers (if not included above). */\n"; - pr "const char *others[] = {\n"; - List.iter fn others; - pr " NULL\n"; pr "};\n" let generate_p2v_authors () = diff --git a/p2v/gui-gtk3-compat.h b/p2v/gui-gtk3-compat.h index 11a9ae120..a29e7b4da 100644 --- a/p2v/gui-gtk3-compat.h +++ b/p2v/gui-gtk3-compat.h @@ -49,11 +49,6 @@ gdk_event_get_button (const GdkEvent *event, guint *button) (box) = gtk_vbox_new ((homogeneous), (spacing)) #endif -#if !GTK_CHECK_VERSION(3,4,0) /* gtk < 3.4 */ -/* Gtk < 3.4 entirely lacked gtk_about_dialog_add_credit_section. */ -#define gtk_about_dialog_add_credit_section(d,k,v) do {} while (0) -#endif - #if GTK_CHECK_VERSION(3,4,0) /* gtk >= 3.4 */ /* GtkGrid is sufficiently similar to GtkTable that we can just * redefine these functions. diff --git a/p2v/gui.c b/p2v/gui.c index aa794b2b4..32c56dda7 100644 --- a/p2v/gui.c +++ b/p2v/gui.c @@ -654,19 +654,6 @@ about_button_clicked (GtkWidget *w, gpointer data) "authors", authors, NULL); - if (documenters[0] != NULL) - g_object_set (G_OBJECT (dialog), - "documenters", documenters, - NULL); - - if (qa[0] != NULL) - gtk_about_dialog_add_credit_section (GTK_ABOUT_DIALOG (dialog), - "Quality assurance", qa); - - if (others[0] != NULL) - gtk_about_dialog_add_credit_section (GTK_ABOUT_DIALOG (dialog), - "Libguestfs development", others); - gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent)); gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);