[gnome-screenshot/wip/jimmac/app-icon-redesign: 6/6] Update icon name references to new name



commit 5dc4cb1539df2fb64c4af266aad0154bf9c0249c
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Mon Sep 3 16:41:46 2018 -0700

    Update icon name references to new name

 src/screenshot-application.c        | 6 ++----
 src/screenshot-interactive-dialog.c | 4 +---
 src/screenshot-utils.h              | 2 ++
 3 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/src/screenshot-application.c b/src/screenshot-application.c
index 3728a58..851715a 100644
--- a/src/screenshot-application.c
+++ b/src/screenshot-application.c
@@ -40,8 +40,6 @@
 #include "screenshot-utils.h"
 #include "screenshot-dialog.h"
 
-#define SCREENSHOOTER_ICON "applets-screenshooter"
-
 #define LAST_SAVE_DIRECTORY_KEY "last-save-directory"
 
 G_DEFINE_TYPE (ScreenshotApplication, screenshot_application, GTK_TYPE_APPLICATION);
@@ -769,7 +767,7 @@ action_about (GSimpleAction *action,
                          "authors", authors,
                          "program-name", _("Screenshot"),
                          "comments", _("Save images of your screen or individual windows"),
-                         "logo-icon-name", "applets-screenshooter",
+                         "logo-icon-name", SCREENSHOT_ICON_NAME,
                          "translator-credits", _("translator-credits"),
                          "license-type", GTK_LICENSE_GPL_2_0,
                          "wrap-license", TRUE,
@@ -836,7 +834,7 @@ screenshot_application_startup (GApplication *app)
   screenshot_load_config ();
 
   g_set_application_name (_("Screenshot"));
-  gtk_window_set_default_icon_name (SCREENSHOOTER_ICON);
+  gtk_window_set_default_icon_name (SCREENSHOT_ICON_NAME);
 
   g_action_map_add_action_entries (G_ACTION_MAP (self), action_entries,
                                    G_N_ELEMENTS (action_entries), self);
diff --git a/src/screenshot-interactive-dialog.c b/src/screenshot-interactive-dialog.c
index e3b95de..dd50c3c 100644
--- a/src/screenshot-interactive-dialog.c
+++ b/src/screenshot-interactive-dialog.c
@@ -29,8 +29,6 @@
 #include "screenshot-interactive-dialog.h"
 #include "screenshot-utils.h"
 
-#define SCREENSHOOTER_ICON "applets-screenshooter"
-
 static GtkWidget *border_check = NULL;
 static GtkWidget *effect_combo = NULL;
 static GtkWidget *effect_label = NULL;
@@ -334,7 +332,7 @@ create_screenshot_frame (GtkWidget   *outer_vbox,
   gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
-  image = gtk_image_new_from_icon_name (SCREENSHOOTER_ICON, GTK_ICON_SIZE_DIALOG);
+  image = gtk_image_new_from_icon_name (SCREENSHOT_ICON_NAME, GTK_ICON_SIZE_DIALOG);
   gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
   gtk_widget_show (image);
 
diff --git a/src/screenshot-utils.h b/src/screenshot-utils.h
index 5382315..8562fbd 100644
--- a/src/screenshot-utils.h
+++ b/src/screenshot-utils.h
@@ -25,6 +25,8 @@
 
 G_BEGIN_DECLS
 
+#define SCREENSHOT_ICON_NAME "org.gnome.Screenshot"
+
 GdkPixbuf *screenshot_get_pixbuf          (GdkRectangle *rectangle);
 
 gint       screenshot_show_dialog   (GtkWindow   *parent,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]