Do Plugins

Merge lp:~joehillen/do-plugins/Firefox-bugfix-491064 into lp:do-plugins

  1. Firefox-bugfix-491064
  2. Merge into trunk
Proposed by JoE
Status: Needs review
Proposed branch: lp:~joehillen/do-plugins/Firefox-bugfix-491064
Merge into: lp:do-plugins
Diff against target: 68 lines (+7/-5)
4 files modified
Firefox/Makefile.am (+2/-1)
Firefox/src/BrowseBookmarkItem.cs (+2/-1)
Firefox/src/BrowseHistoryItem.cs (+1/-1)
Firefox/src/PlacesItemSource.cs (+2/-2)
To merge this branch: bzr merge lp:~joehillen/do-plugins/Firefox-bugfix-491064
Reviewer Review Type Date Requested Status
Do Plugins Team Pending
Review via email: mp+15717@code.launchpad.net
To post a comment you must log in.
Revision history for this message
JoE (joehillen) wrote :

This is a fix for the icon in the Firefox plugin.

Reply

Unmerged revisions

675. By JoE

Added Icon for Firefox Plugin.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Firefox/Makefile.am'
2--- Firefox/Makefile.am 2009-06-22 04:05:16 +0000
3+++ Firefox/Makefile.am 2009-12-06 22:20:28 +0000
4@@ -10,7 +10,8 @@
5 src/PlacesItemSource.cs
6
7 RESOURCES = \
8- Resources/Firefox.addin.xml
9+ Resources/Firefox.addin.xml \
10+ Resources/icons/firefox.png
11
12 REFERENCES = \
13 System \
14
15=== added directory 'Firefox/Resources/icons'
16=== added file 'Firefox/Resources/icons/firefox.png'
17Binary files Firefox/Resources/icons/firefox.png 1970-01-01 00:00:00 +0000 and Firefox/Resources/icons/firefox.png 2009-12-06 22:20:28 +0000 differ
18=== modified file 'Firefox/src/BrowseBookmarkItem.cs'
19--- Firefox/src/BrowseBookmarkItem.cs 2009-06-22 04:05:16 +0000
20+++ Firefox/src/BrowseBookmarkItem.cs 2009-12-06 22:20:28 +0000
21@@ -1,4 +1,5 @@
22 // BrowseBookmarkItem.cs
23+//
24 // GNOME Do is the legal property of its developers, whose names are too
25 // numerous to list here. Please refer to the COPYRIGHT file distributed with
26 // this source distribution.
27@@ -35,7 +36,7 @@
28 }
29
30 public override string Icon {
31- get { return "firefox-3.0"; }
32+ get { return "firefox.png@" + GetType ().Assembly.FullName; }
33 }
34 }
35 }
36
37=== modified file 'Firefox/src/BrowseHistoryItem.cs'
38--- Firefox/src/BrowseHistoryItem.cs 2009-06-22 04:05:16 +0000
39+++ Firefox/src/BrowseHistoryItem.cs 2009-12-06 22:20:28 +0000
40@@ -37,7 +37,7 @@
41 }
42
43 public override string Icon {
44- get { return "firefox-3.0"; }
45+ get { return "firefox.png@" + GetType ().Assembly.FullName; }
46 }
47 }
48 }
49
50=== modified file 'Firefox/src/PlacesItemSource.cs'
51--- Firefox/src/PlacesItemSource.cs 2009-09-05 02:06:59 +0000
52+++ Firefox/src/PlacesItemSource.cs 2009-12-06 22:20:28 +0000
53@@ -74,7 +74,7 @@
54 }
55
56 public override string Icon {
57- get { return "firefox-3.0"; }
58+ get { return "firefox.png@" + GetType ().Assembly.FullName; }
59 }
60
61 public override IEnumerable<Item> Items {
62@@ -309,4 +309,4 @@
63 }
64 }
65 }
66-}
67\ No newline at end of file
68+}

Subscribers

People subscribed via source and target branches