← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/70_notification_strings_shorten.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
https://launchpad.net/bugs/345472
* 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:
debian/patches/70_notification_strings_shorten.dpatch
 
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        2008-10-31 17:46:48 +0000
 
6
+++ new/src/fe-gtk/plugin-tray.c        2009-03-13 12:06:32 +0000
 
7
@@ -653,7 +653,7 @@
 
8
        }
 
9
 
 
10
        if (prefs.input_balloon_hilight)
 
11
-               tray_set_balloonf (word[2], _("XChat: Highlighted message from: %s (%s)"),
 
12
+               tray_set_balloonf (word[2], _("%s (%s)"),
 
13
                                                                 word[1], xchat_get_info (ph, "channel"));
 
14
 
 
15
        return XCHAT_EAT_NONE;
 
16
@@ -678,8 +678,8 @@
 
17
        }
 
18
 
 
19
        if (prefs.input_balloon_chans)
 
20
-               tray_set_balloonf (word[2], _("XChat: New public message from: %s (%s)"),
 
21
-                                                                word[1], xchat_get_info (ph, "channel"));
 
22
+               tray_set_balloonf (word[2], _("%s (%s)"),
 
23
+                                                                word[1], xchat_get_info(ph, "channel"));
 
24
 
 
25
        return XCHAT_EAT_NONE;
 
26
 }
 
27
@@ -707,8 +707,8 @@
 
28
                                                        tray_priv_count, from, network);
 
29
 
 
30
        if (prefs.input_balloon_priv)
 
31
-               tray_set_balloonf (text, _("XChat: Private message from: %s (%s)"),
 
32
-                                                                from, network);
 
33
+               tray_set_balloonf (text, "%s",
 
34
+                                                                from);
 
35
 }
 
36
 
 
37
 static int
 
38
@@ -761,8 +761,8 @@
 
39
        }
 
40
 
 
41
        if (prefs.input_balloon_priv)
 
42
-               tray_set_balloonf ("", _("XChat: File offer from: %s (%s)"),
 
43
-                                                               word[1], network);
 
44
+               tray_set_balloonf (_("is offering you a file."), "%s",
 
45
+                                                               word[1]);
 
46
 
 
47
        return XCHAT_EAT_NONE;
 
48
 }
 
49