From d32524e211f7af301845b5db518d818b77831205 Mon Sep 17 00:00:00 2001
From: Robert Tari <robert@tari.in>
Date: Tue, 6 Sep 2022 03:21:41 +0200
Subject: Rewrite to indicator-ng: Code and build changes

---
 src/indicator-printer-state-notifier.c | 36 +++++++---------------------------
 1 file changed, 7 insertions(+), 29 deletions(-)

(limited to 'src/indicator-printer-state-notifier.c')

diff --git a/src/indicator-printer-state-notifier.c b/src/indicator-printer-state-notifier.c
index 7a587a0..12f77c6 100644
--- a/src/indicator-printer-state-notifier.c
+++ b/src/indicator-printer-state-notifier.c
@@ -1,7 +1,9 @@
 /*
  * Copyright 2012 Canonical Ltd.
+ * Copyright 2022 Robert Tari
  *
  * Authors: Lars Uebernickel <lars.uebernickel@canonical.com>
+ *          Robert Tari <robert@tari.in>
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -17,9 +19,8 @@
  */
 
 #include "indicator-printer-state-notifier.h"
-
+#include <ayatana/common/utils.h>
 #include <glib/gi18n.h>
-#include <gtk/gtk.h>
 #include <cups/cups.h>
 #include <string.h>
 #include <stdarg.h>
@@ -27,9 +28,6 @@
 #include "cups-notifier.h"
 #include "spawn-printer-settings.h"
 
-
-#define RESPONSE_SHOW_SYSTEM_SETTINGS 1
-
 struct _IndicatorPrinterStateNotifierPrivate
 {
     CupsNotifier *cups_notifier;
@@ -95,12 +93,9 @@ show_alert_box (const gchar *printer,
                 const gchar *reason,
                 int njobs)
 {
-    GtkWidget *dialog;
-    GtkWidget *image;
     gchar *primary_text;
     gchar *secondary_text;
 
-    image = gtk_image_new_from_icon_name ("printer", GTK_ICON_SIZE_DIALOG);
     primary_text = g_strdup_printf (reason, printer);
 
     secondary_text = g_strdup_printf (ngettext(
@@ -108,31 +103,14 @@ show_alert_box (const gchar *printer,
                    "You have %d jobs queued to print on this printer.", njobs),
                    njobs);
 
-    dialog = g_object_new (GTK_TYPE_MESSAGE_DIALOG,
-                           "title", _("Printing Problem"),
-                           "icon-name", "printer",
-                           "image", image,
-                           "text", primary_text,
-                           "secondary-text", secondary_text,
-                           "urgency-hint", TRUE,
-                           "focus-on-map", FALSE,
-                           "window-position", GTK_WIN_POS_CENTER,
-                           "skip-taskbar-hint", FALSE,
-                           "deletable", FALSE,
-                           NULL);
-
+    gchar *sText = g_strdup_printf("<b>%s</b>\n\n%s", primary_text, secondary_text);
     g_free (primary_text);
     g_free (secondary_text);
 
-    gtk_dialog_add_buttons(GTK_DIALOG (dialog), _("_Settings…"), RESPONSE_SHOW_SYSTEM_SETTINGS, _("_OK"), GTK_RESPONSE_OK, NULL);
-    gtk_dialog_set_default_response (GTK_DIALOG (dialog),
-                                     GTK_RESPONSE_OK);
-    gtk_widget_show_all (dialog);
-
-    if (gtk_dialog_run (GTK_DIALOG (dialog)) == RESPONSE_SHOW_SYSTEM_SETTINGS)
-        spawn_printer_settings ();
+    ayatana_common_utils_zenity_warning ("printer", _("Printing Problem"), sText);
+    g_free (sText);
 
-    gtk_widget_destroy (dialog);
+    spawn_printer_settings ();
 }
 
 
-- 
cgit v1.2.3