~cldunlap1/ubuntu/oneiric/xchat/fix-for-816506

« back to all changes in this revision

Viewing changes to debian/patches/71_notification_icon_change.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Ted Gould
  • Date: 2009-03-19 09:15:32 UTC
  • Revision ID: james.westby@ubuntu.com-20090319091532-bkkv6n17cjr42cni
Tags: 2.8.6-2.1ubuntu4
* debian/patches/71_notification_icon_change.dpatch switch to using
  the nicer icon for notifications. (LP: #345472)
* debian/patches/70_notification_strings_shorten.dpatch to make the
  notification strings much shorter for cleaner notifications.

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
#! /bin/sh /usr/share/dpatch/dpatch-run
 
2
 
 
3
@DPATCH@
 
4
=== modified file 'src/fe-gtk/plugin-tray.c'
 
5
--- old/src/fe-gtk/plugin-tray.c        2009-03-13 12:08:06 +0000
 
6
+++ new/src/fe-gtk/plugin-tray.c        2009-03-13 14:43:32 +0000
 
7
@@ -174,7 +174,7 @@
 
8
 
 
9
        text = strip_color (text, -1, STRIP_ALL|STRIP_ESCMARKUP);
 
10
        title = strip_color (title, -1, STRIP_ALL);
 
11
-       noti = nn_new (title, text, XCHATSHAREDIR"/pixmaps/xchat.png", NULL);
 
12
+       noti = nn_new (title, text, "notification-message-im", NULL);
 
13
        g_free ((char *)title);
 
14
        g_free ((char *)text);
 
15
 
 
16
@@ -225,9 +225,7 @@
 
17
        {
 
18
                argv[0] = path;
 
19
                argv[1] = "-i";
 
20
-               argv[2] = "gtk-dialog-info";
 
21
-               if (access (XCHATSHAREDIR"/pixmaps/xchat.png", R_OK) == 0)
 
22
-                       argv[2] = XCHATSHAREDIR"/pixmaps/xchat.png";
 
23
+               argv[2] = "notification-message-im";
 
24
                argv[3] = "-t";
 
25
                argv[4] = "20000";
 
26
                argv[5] = title;
 
27