[nautilus-actions] Replace icon specification by those from core/na_about
- From: Pierre Wieser <pwieser src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus-actions] Replace icon specification by those from core/na_about
- Date: Wed, 15 Feb 2017 22:44:25 +0000 (UTC)
commit 099eedf558edbd37d8313cdda42c533586c24259
Author: Pierre Wieser <pwieser trychlos org>
Date: Thu Jul 9 17:11:58 2015 +0200
Replace icon specification by those from core/na_about
src/nact/Makefile.am | 3 ---
src/nact/nact-main-window.c | 4 ++--
2 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/src/nact/Makefile.am b/src/nact/Makefile.am
index 7d4feab..fe33512 100644
--- a/src/nact/Makefile.am
+++ b/src/nact/Makefile.am
@@ -29,8 +29,6 @@ bin_PROGRAMS = \
nautilus-actions-config-tool \
$(NULL)
-icon_fname = $(datadir)/icons/hicolor/48x48/apps/nautilus-actions.png
-
ui_datadir = $(pkgdatadir)/ui
egg_platform_defines = -DEGG_SM_CLIENT_BACKEND_XSMP
@@ -40,7 +38,6 @@ AM_CPPFLAGS += \
-I $(top_srcdir)/src \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DG_LOG_DOMAIN=\"${NA_LOGDOMAIN_NACT}\" \
- -DICON_FNAME=\"$(icon_fname)\" \
-DPKGUIDIR=\"$(ui_datadir)\" \
$(egg_platform_defines) \
$(NAUTILUS_ACTIONS_CFLAGS) \
diff --git a/src/nact/nact-main-window.c b/src/nact/nact-main-window.c
index 572e8c9..147717b 100644
--- a/src/nact/nact-main-window.c
+++ b/src/nact/nact-main-window.c
@@ -37,6 +37,7 @@
#include "api/na-object-api.h"
#include "api/na-timeout.h"
+#include "core/na-about.h"
#include "core/na-gtk-utils.h"
#include "core/na-iprefs.h"
#include "core/na-pivot.h"
@@ -147,7 +148,6 @@ enum {
static const gchar *st_xmlui_filename = PKGUIDIR "/nact-main-window.ui";
static const gchar *st_toplevel_name = "MainWindow";
static const gchar *st_wsp_name = NA_IPREFS_MAIN_WINDOW_WSP;
-static const gchar *st_icon_filename = ICON_FNAME;
static gint st_burst_timeout = 2500; /* burst timeout in msec */
static BaseWindowClass *st_parent_class = NULL;
@@ -754,7 +754,7 @@ setup_main_ui( NactMainWindow *main_window )
/* application icon
*/
- gtk_window_set_default_icon_from_file( st_icon_filename, NULL );
+ gtk_window_set_default_icon_from_file( na_about_get_icon_name(), NULL );
}
/*
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]