[Pkg-wmaker-commits] [wmshutdown] 128/173: wmshutdown.c: Replace deprecated gtk_dialog_get_action_area with gtk_dialog_add_buttons.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmshutdown.

commit 605579c6ae91017304c53a344ff0c0133e5e80c4
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date:   Sat Oct 25 20:08:52 2014 -0500

    wmshutdown.c: Replace deprecated gtk_dialog_get_action_area with
    gtk_dialog_add_buttons.
---
 wmshutdown.c | 67 +++++++++++++++++++++++++++---------------------------------
 1 file changed, 30 insertions(+), 37 deletions(-)

diff --git a/wmshutdown.c b/wmshutdown.c
index 5864604..78a4511 100644
--- a/wmshutdown.c
+++ b/wmshutdown.c
@@ -24,6 +24,9 @@
 #include <config.h>
 #endif
 
+#define GTK_RESPONSE_HALT   1
+#define GTK_RESPONSE_REBOOT 2
+
 #ifdef CONSOLEKIT
 #define HALT_METHOD      "Stop"
 #define REBOOT_METHOD    "Restart"
@@ -96,13 +99,11 @@ void fecha(void) {
 	dialog = NULL;
 }
 
-void handle_click(GtkWidget *widget, gpointer data) {
+void handle_click(GtkWidget *widget, char *method) {
 	GDBusConnection *connection;
 	GDBusMessage *message, *reply;
 	GError *error = NULL;
 
-	gchar *method = (gchar *)data;
-
 	connection = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &error);
 	message = g_dbus_message_new_method_call(
 			NULL,
@@ -140,50 +141,42 @@ void handle_click(GtkWidget *widget, gpointer data) {
 
 void button_press(GtkWidget *widget, GdkEvent *event) {
 	GtkWidget *label;
-	gchar *message;
-	GtkWidget *halt_button;
-	GtkWidget *reboot_button;
-	GtkWidget *cancel_button;
+	gint result;
 
 	GdkEventButton  *bevent = (GdkEventButton *)event;
 	switch (bevent->button) {
 	case 1:
 		if (dialog != NULL)
 			return;
-		message = "Shutdown confirmation";
 		dialog = gtk_dialog_new();
-		label = gtk_label_new(message);
-
-		halt_button = gtk_button_new_with_label("Halt");
-		reboot_button = gtk_button_new_with_label("Reboot");
-		cancel_button = gtk_button_new_with_label("Cancel");
-
-		g_signal_connect(dialog, "destroy", G_CALLBACK(fecha), NULL);
-		g_signal_connect(cancel_button,
-				 "clicked",
-				 G_CALLBACK(fecha),
-				 (gpointer) dialog);
-		g_signal_connect(halt_button,
-				 "clicked",
-				 G_CALLBACK(handle_click),
-				 HALT_METHOD);
-		g_signal_connect(reboot_button,
-				 "clicked",
-				 G_CALLBACK(handle_click),
-				 REBOOT_METHOD);
-		gtk_container_add(GTK_CONTAINER(gtk_dialog_get_action_area(
-							GTK_DIALOG(dialog))),
-				  halt_button);
-		gtk_container_add(GTK_CONTAINER(gtk_dialog_get_action_area(
-							GTK_DIALOG(dialog))),
-				  reboot_button);
-		gtk_container_add(GTK_CONTAINER(gtk_dialog_get_action_area(
-							GTK_DIALOG(dialog))),
-				  cancel_button);
+		label = gtk_label_new("Shutdown confirmation");
 		gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(
 							GTK_DIALOG(dialog))),
 				  label);
-		gtk_widget_show_all(dialog);
+		gtk_widget_show(label);
+		gtk_dialog_add_buttons(GTK_DIALOG(dialog),
+				       "Halt", GTK_RESPONSE_HALT,
+				       "Reboot", GTK_RESPONSE_REBOOT,
+				       "Cancel", GTK_RESPONSE_CANCEL, NULL);
+
+		g_signal_connect(dialog, "destroy", G_CALLBACK(fecha), NULL);
+
+		result = gtk_dialog_run(GTK_DIALOG (dialog));
+		switch (result) {
+		case GTK_RESPONSE_HALT:
+			handle_click(dialog, HALT_METHOD);
+			break;
+		case GTK_RESPONSE_REBOOT:
+			handle_click(dialog, REBOOT_METHOD);
+			break;
+		case GTK_RESPONSE_CANCEL:
+			fecha();
+			break;
+		default:
+			break;
+		}
+	default:
+		break;
 	}
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmshutdown.git