grsync/trunk/use-themed-icon.patch

   1 diff -Naur grsync-1.2.6.orig/configure.in grsync-1.2.6/configure.in
   2 --- grsync-1.2.6.orig/configure.in      2016-03-15 14:08:19.000000000 +0100
   3 +++ grsync-1.2.6/configure.in   2018-12-30 11:36:44.314049975 +0100
   4 @@ -30,7 +30,7 @@
   5                 GTK_API_VERSION="2.0"
   6  fi
   7  pkg_modules="gtk+-$GTK_API_VERSION >= 2.16.0"
   8 -OTHER_DESKTOP_ENTRIES="Icon=grsync.png"
   9 +OTHER_DESKTOP_ENTRIES="Icon=grsync"
  10  MIMEINFO_XMLNS="xmlns='http://www.freedesktop.org/standards/shared-mime-info'"
  11  MIME_OSSOCAT=""
  12
  13 diff -Naur grsync-1.2.6.orig/Makefile.am grsync-1.2.6/Makefile.am
  14 --- grsync-1.2.6.orig/Makefile.am       2013-04-30 13:48:54.000000000 +0200
  15 +++ grsync-1.2.6/Makefile.am    2018-12-30 11:37:36.995541833 +0100
  16 @@ -61,10 +61,10 @@
  17  mimepackagesdir = $(mimedir)/packages
  18  dist_mimepackages_DATA = grsync.xml
  19
  20 -pixmapdir = $(datadir)/pixmaps
  21 +pixmapdir = $(datadir)/icons/hicolor/128x128/apps
  22  pixmap_DATA = pixmaps/grsync.png
  23
  24 -pixmapbusydir = $(datadir)/pixmaps
  25 +pixmapbusydir = $(datadir)/icons/hicolor/128x128/apps
  26  pixmapbusy_DATA = pixmaps/grsync-busy.png
  27
  28  mimeicondir = $(datadir)/icons/hicolor/48x48/mimetypes/
  29 diff -Naur grsync-1.2.6.orig/src/callbacks.c grsync-1.2.6/src/callbacks.c
  30 --- grsync-1.2.6.orig/src/callbacks.c   2015-12-23 16:38:40.000000000 +0100
  31 +++ grsync-1.2.6/src/callbacks.c        2018-12-30 11:41:43.179172285 +0100
  32 @@ -57,7 +57,7 @@
  33  void set_trayicon(gboolean flag) {
  34         if (flag) {
  35                 if (trayIcon == NULL) {
  36 -                       trayIcon = gtk_status_icon_new_from_file(icon);
  37 +                       trayIcon = gtk_status_icon_new_from_icon_name(ICON);
  38                         g_signal_connect(GTK_STATUS_ICON(trayIcon), "activate", G_CALLBACK(on_trayicon_activate), main_window);
  39                 }
  40         } else {
  41 @@ -71,7 +71,7 @@
  42
  43
  44  void set_trayicon_icon(gboolean busy) {
  45 -       if (trayIcon != NULL) gtk_status_icon_set_from_file(trayIcon, busy ? icon_busy : icon);
  46 +       if (trayIcon != NULL) gtk_status_icon_set_from_icon_name(trayIcon, busy ? ICON_BUSY : ICON);
  47  }
  48
  49  gboolean get_checkbox(gchar* name) {
  50 @@ -1341,7 +1341,7 @@
  51
  52         gtk_show_about_dialog((GtkWindow*) main_window, "name", PACKAGE, "version", VERSION, "comments", _("Synchronize files and folders (a GTK GUI for rsync)."),
  53                 "copyright", _("(C) Piero Orsoni and others. Released under the GPL.\nSee COPYING for details"),
  54 -               "website", "http://www.opbyte.it/grsync/", "artists", artists, "authors", authors, NULL);
  55 +               "website", "http://www.opbyte.it/grsync/", "artists", artists, "authors", authors, "logo-icon-name", ICON, NULL);
  56  }
  57
  58
  59 diff -Naur grsync-1.2.6.orig/src/callbacks.h grsync-1.2.6/src/callbacks.h
  60 --- grsync-1.2.6.orig/src/callbacks.h   2013-04-30 13:48:54.000000000 +0200
  61 +++ grsync-1.2.6/src/callbacks.h        2018-12-30 11:41:13.194991363 +0100
  62 @@ -2,10 +2,8 @@
  63  #define MAXOPT 100
  64  #define CONFIG_GROUP "__CONFIG"
  65
  66 -#define ICON_SOURCE "pixmaps/grsync.png"
  67 -#define ICON_SOURCE_BUSY "pixmaps/grsync-busy.png"
  68 -#define ICON_PACKAGE PACKAGE_DATA_DIR "/" ICON_SOURCE
  69 -#define ICON_PACKAGE_BUSY PACKAGE_DATA_DIR "/" ICON_SOURCE_BUSY
  70 +#define ICON "grsync"
  71 +#define ICON_BUSY "grsync-busy"
  72
  73  GtkBuilder *builder;
  74  GtkWidget *main_window;
  75 diff -Naur grsync-1.2.6.orig/src/main.c grsync-1.2.6/src/main.c
  76 --- grsync-1.2.6.orig/src/main.c        2013-04-30 13:48:54.000000000 +0200
  77 +++ grsync-1.2.6/src/main.c     2018-12-30 11:41:45.745911502 +0100
  78 @@ -68,9 +68,7 @@
  79                 cmdline_import = FALSE;
  80         }
  81
  82 -       icon = g_file_test(ICON_SOURCE, G_FILE_TEST_EXISTS) ? ICON_SOURCE : ICON_PACKAGE;
  83 -       icon_busy = g_file_test(ICON_SOURCE_BUSY, G_FILE_TEST_EXISTS) ? ICON_SOURCE_BUSY : ICON_PACKAGE_BUSY;
  84 -       gtk_window_set_default_icon_from_file(icon, NULL);
  85 +       gtk_window_set_default_icon_name(ICON);
  86
  87         builder = gtk_builder_new();
  88         result = gtk_builder_add_from_file(builder, XMLFILE, &gerror) || gtk_builder_add_from_file(builder, PACKAGE_DATA_DIR "/" PACKAGE "/" XMLFILE, NULL);