aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@gmail.com>2007-05-14 22:03:11 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2007-05-14 22:03:11 +0800
commit3c081aef0881fd7d71dd327be0714a2346c454be (patch)
tree45919ebc0e3c7a5584d8b896bfe3c2a42ad33d4b
parentbc3fac61996f1b403df48bf59826a38540b5d4c2 (diff)
downloadgsoc2013-empathy-3c081aef0881fd7d71dd327be0714a2346c454be.tar
gsoc2013-empathy-3c081aef0881fd7d71dd327be0714a2346c454be.tar.gz
gsoc2013-empathy-3c081aef0881fd7d71dd327be0714a2346c454be.tar.bz2
gsoc2013-empathy-3c081aef0881fd7d71dd327be0714a2346c454be.tar.lz
gsoc2013-empathy-3c081aef0881fd7d71dd327be0714a2346c454be.tar.xz
gsoc2013-empathy-3c081aef0881fd7d71dd327be0714a2346c454be.tar.zst
gsoc2013-empathy-3c081aef0881fd7d71dd327be0714a2346c454be.zip
Add empathy icon stolen from cohoba.
2006-05-14 Xavier Claessens <xclaesse@gmail.com> * src/empathy-chat-main.c: * src/empathy-main.c: * configure.ac: * data/22x22/Makefile.am: * data/22x22/empathy.png: * data/48x48: * data/48x48/Makefile.am: * data/48x48/empathy.png: * data/32x32/Makefile.am: * data/32x32/empathy.png: * data/16x16/empathy.png: * data/16x16/Makefile.am: * data/scalable/empathy.svg: * data/scalable/Makefile.am: * data/Makefile.am: Add empathy icon stolen from cohoba. svn path=/trunk/; revision=63
-rw-r--r--ChangeLog18
-rw-r--r--configure.ac1
-rw-r--r--data/16x16/Makefile.am1
-rw-r--r--data/16x16/empathy.pngbin0 -> 797 bytes
-rw-r--r--data/22x22/Makefile.am1
-rw-r--r--data/22x22/empathy.pngbin0 -> 1176 bytes
-rw-r--r--data/32x32/Makefile.am1
-rw-r--r--data/32x32/empathy.pngbin0 -> 1811 bytes
-rw-r--r--data/48x48/Makefile.am4
-rw-r--r--data/48x48/empathy.pngbin0 -> 2934 bytes
-rw-r--r--data/Makefile.am2
-rw-r--r--data/scalable/Makefile.am1
-rwxr-xr-xdata/scalable/empathy.svg261
-rw-r--r--src/empathy-chat-main.c2
-rw-r--r--src/empathy-main.c2
15 files changed, 293 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a032132ea..357803d7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,24 @@
2006-05-14 Xavier Claessens <xclaesse@gmail.com>
* src/empathy-chat-main.c:
+ * src/empathy-main.c:
+ * configure.ac:
+ * data/22x22/Makefile.am:
+ * data/22x22/empathy.png:
+ * data/48x48:
+ * data/48x48/Makefile.am:
+ * data/48x48/empathy.png:
+ * data/32x32/Makefile.am:
+ * data/32x32/empathy.png:
+ * data/16x16/empathy.png:
+ * data/16x16/Makefile.am:
+ * data/scalable/empathy.svg:
+ * data/scalable/Makefile.am:
+ * data/Makefile.am: Add empathy icon stolen from cohoba.
+
+2006-05-14 Xavier Claessens <xclaesse@gmail.com>
+
+ * src/empathy-chat-main.c:
* src/Makefile.am:
* src/empathy-main.c:
* po/POTFILES.in
diff --git a/configure.ac b/configure.ac
index 5667da1ff..f301507a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -88,6 +88,7 @@ AC_OUTPUT([
data/16x16/Makefile
data/22x22/Makefile
data/32x32/Makefile
+ data/48x48/Makefile
data/scalable/Makefile
po/Makefile.in
libempathy/Makefile
diff --git a/data/16x16/Makefile.am b/data/16x16/Makefile.am
index b885d1c88..8d2606184 100644
--- a/data/16x16/Makefile.am
+++ b/data/16x16/Makefile.am
@@ -1,5 +1,6 @@
icondir = $(datadir)/icons/hicolor/16x16/apps
icon_DATA = \
+ empathy.png \
empathy-available.png \
empathy-offline.png \
empathy-away.png \
diff --git a/data/16x16/empathy.png b/data/16x16/empathy.png
new file mode 100644
index 000000000..3d400d8ef
--- /dev/null
+++ b/data/16x16/empathy.png
Binary files differ
diff --git a/data/22x22/Makefile.am b/data/22x22/Makefile.am
index 592422391..e552f6e5a 100644
--- a/data/22x22/Makefile.am
+++ b/data/22x22/Makefile.am
@@ -1,5 +1,6 @@
icondir = $(datadir)/icons/hicolor/22x22/apps
icon_DATA = \
+ empathy.png \
empathy-proto-ekiga.png \
empathy-proto-google-talk.png \
empathy-proto-msn.png \
diff --git a/data/22x22/empathy.png b/data/22x22/empathy.png
new file mode 100644
index 000000000..d3e89c919
--- /dev/null
+++ b/data/22x22/empathy.png
Binary files differ
diff --git a/data/32x32/Makefile.am b/data/32x32/Makefile.am
index 452abb030..1475e1ef1 100644
--- a/data/32x32/Makefile.am
+++ b/data/32x32/Makefile.am
@@ -1,5 +1,6 @@
icondir = $(datadir)/icons/hicolor/32x32/apps
icon_DATA = \
+ empathy.png \
empathy-proto-ekiga.png \
empathy-proto-google-talk.png \
empathy-proto-msn.png \
diff --git a/data/32x32/empathy.png b/data/32x32/empathy.png
new file mode 100644
index 000000000..9e29d7f42
--- /dev/null
+++ b/data/32x32/empathy.png
Binary files differ
diff --git a/data/48x48/Makefile.am b/data/48x48/Makefile.am
new file mode 100644
index 000000000..5c37938a0
--- /dev/null
+++ b/data/48x48/Makefile.am
@@ -0,0 +1,4 @@
+icondir = $(datadir)/icons/hicolor/48x48/apps
+icon_DATA = \
+ empathy.png
+EXTRA_DIST = $(icon_DATA)
diff --git a/data/48x48/empathy.png b/data/48x48/empathy.png
new file mode 100644
index 000000000..753779a9c
--- /dev/null
+++ b/data/48x48/empathy.png
Binary files differ
diff --git a/data/Makefile.am b/data/Makefile.am
index 0822f40ef..093565c87 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = 16x16 22x22 32x32 scalable
+SUBDIRS = 16x16 22x22 32x32 48x48 scalable
profiledir = $(datadir)/mission-control/profiles
profile_DATA = \
diff --git a/data/scalable/Makefile.am b/data/scalable/Makefile.am
index 3c535d048..6e144da56 100644
--- a/data/scalable/Makefile.am
+++ b/data/scalable/Makefile.am
@@ -1,5 +1,6 @@
icondir = $(datadir)/icons/hicolor/scalable/apps
icon_DATA = \
+ empathy.svg \
empathy-available.svg \
empathy-offline.svg \
empathy-away.svg \
diff --git a/data/scalable/empathy.svg b/data/scalable/empathy.svg
new file mode 100755
index 000000000..875c0ef0a
--- /dev/null
+++ b/data/scalable/empathy.svg
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="120"
+ height="120"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.43"
+ sodipodi:docbase="/home/kikidonk"
+ sodipodi:docname="telepathy.svg"
+ version="1.0">
+ <defs
+ id="defs4">
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient2299">
+ <stop
+ style="stop-color:#729fcf"
+ offset="0"
+ id="stop2301" />
+ <stop
+ style="stop-color:#204a87"
+ offset="1"
+ id="stop2303" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient2277">
+ <stop
+ style="stop-color:#729fcf"
+ offset="0"
+ id="stop2279" />
+ <stop
+ style="stop-color:#204a87"
+ offset="1"
+ id="stop2281" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient2248">
+ <stop
+ style="stop-color:#729fcf"
+ offset="0"
+ id="stop2250" />
+ <stop
+ style="stop-color:#204a87"
+ offset="1"
+ id="stop2252" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient2316">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop2318" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop2320" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2316"
+ id="radialGradient1455"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.446154,-9.531266e-14,218.1391)"
+ cx="37.5"
+ cy="393.86218"
+ fx="37.5"
+ fy="393.86218"
+ r="32.5" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2316"
+ id="radialGradient1457"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.446154,3.441346e-14,218.1391)"
+ cx="37.5"
+ cy="393.86218"
+ fx="37.5"
+ fy="393.86218"
+ r="32.5" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2248"
+ id="radialGradient1459"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.868658,-0.148746,0.168018,2.110777,-257.031,-963.2931)"
+ cx="152.6485"
+ cy="532.39001"
+ fx="152.6485"
+ fy="532.39001"
+ r="29.863501" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2248"
+ id="radialGradient1461"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.550415,-4.746643e-6,6.036308e-6,1.971663,-152.6655,-900.8159)"
+ cx="209.66589"
+ cy="518.98993"
+ fx="209.66589"
+ fy="518.98993"
+ r="21.839567" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2277"
+ id="linearGradient1463"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-35,-392)"
+ x1="156.27637"
+ y1="519.47235"
+ x2="168.11945"
+ y2="588.41528" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2299"
+ id="linearGradient1465"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-35,-392)"
+ x1="210.31523"
+ y1="513.20483"
+ x2="218.00374"
+ y2="561.11133" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1"
+ inkscape:cx="391.86649"
+ inkscape:cy="58.28661"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ fill="#edd400"
+ stroke="#edd400"
+ inkscape:window-width="1014"
+ inkscape:window-height="693"
+ inkscape:window-x="0"
+ inkscape:window-y="25" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <g
+ id="g1350"
+ transform="translate(-86.71068,-84.05382)">
+ <path
+ sodipodi:type="arc"
+ style="opacity:0.34302326;fill:url(#radialGradient1455);fill-opacity:1;stroke:none;stroke-width:5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="path2324"
+ sodipodi:cx="37.5"
+ sodipodi:cy="393.86218"
+ sodipodi:rx="32.5"
+ sodipodi:ry="14.5"
+ d="M 70 393.86218 A 32.5 14.5 0 1 1 5,393.86218 A 32.5 14.5 0 1 1 70 393.86218 z"
+ transform="matrix(0.553846,0,0,0.769231,155.2308,-139.4549)" />
+ <path
+ transform="matrix(0.753846,0,0,1,103.2308,-206)"
+ d="M 70 393.86218 A 32.5 14.5 0 1 1 5,393.86218 A 32.5 14.5 0 1 1 70 393.86218 z"
+ sodipodi:ry="14.5"
+ sodipodi:rx="32.5"
+ sodipodi:cy="393.86218"
+ sodipodi:cx="37.5"
+ id="path2314"
+ style="opacity:0.34883722;fill:url(#radialGradient1457);fill-opacity:1;stroke:none;stroke-width:5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="fill:#babdb6;stroke:none;stroke-width:3.83500004;stroke-miterlimit:4;stroke-dasharray:none"
+ id="path2284"
+ sodipodi:cx="466.5"
+ sodipodi:cy="225.86218"
+ sodipodi:rx="13.5"
+ sodipodi:ry="13.5"
+ d="M 480 225.86218 A 13.5 13.5 0 1 1 453,225.86218 A 13.5 13.5 0 1 1 480 225.86218 z"
+ transform="matrix(0.239488,0,0,0.239488,6.4093,56.699)" />
+ <path
+ style="fill:url(#radialGradient1459);fill-opacity:1;stroke:#204a87;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 150.2161,142.69583 C 144.93306,149.11959 157.74053,160.99323 155.32886,164.76875 C 151.71258,170.43013 145.72673,166.37911 146.5107,170.91369 C 147.10639,174.35931 146.90129,177.59442 143.94504,179.55357 C 146.05169,185.93861 138.60199,192.13547 135.06149,192.88614 C 120.89943,195.8888 101.90698,167.7371 98.90432,153.57504 C 95.90165,139.41298 104.95855,125.4822 119.1206,122.47955 C 133.28265,119.47688 147.21343,128.53378 150.2161,142.69583 z "
+ id="path2286"
+ sodipodi:nodetypes="csscsssc" />
+ <path
+ sodipodi:nodetypes="csscsssc"
+ id="path2288"
+ d="M 161.93542,131.68159 C 165.74994,136.31974 156.62403,144.65072 158.36534,147.37677 C 160.97641,151.46447 165.17688,148.78167 164.61083,152.05578 C 164.18072,154.54363 164.32882,156.87948 166.46332,158.29405 C 164.94226,162.90425 170.26698,167.13724 172.82334,167.67925 C 183.04881,169.84727 196.81615,149.76218 198.98416,139.53672 C 201.15218,129.31126 194.61282,119.25279 184.38736,117.08478 C 174.16191,114.91676 164.10344,121.45613 161.93542,131.68159 z "
+ style="fill:url(#radialGradient1461);fill-opacity:1;stroke:#204a87;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ transform="matrix(0.448469,0,0,0.448469,-80.909,-3.4852)"
+ d="M 480 225.86218 A 13.5 13.5 0 1 1 453,225.86218 A 13.5 13.5 0 1 1 480 225.86218 z"
+ sodipodi:ry="13.5"
+ sodipodi:rx="13.5"
+ sodipodi:cy="225.86218"
+ sodipodi:cx="466.5"
+ id="path2290"
+ style="fill:#babdb6;stroke:none;stroke-width:3.83500004;stroke-miterlimit:4;stroke-dasharray:none"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="fill:#babdb6;stroke:none;stroke-width:3.83500004;stroke-miterlimit:4;stroke-dasharray:none"
+ id="path2292"
+ sodipodi:cx="466.5"
+ sodipodi:cy="225.86218"
+ sodipodi:rx="13.5"
+ sodipodi:ry="13.5"
+ d="M 480 225.86218 A 13.5 13.5 0 1 1 453,225.86218 A 13.5 13.5 0 1 1 480 225.86218 z"
+ transform="matrix(0.376714,0,0,0.376714,-29.9988,8.3624)" />
+ <path
+ transform="matrix(0.269082,0,0,0.269082,35.2264,38.422)"
+ d="M 480 225.86218 A 13.5 13.5 0 1 1 453,225.86218 A 13.5 13.5 0 1 1 480 225.86218 z"
+ sodipodi:ry="13.5"
+ sodipodi:rx="13.5"
+ sodipodi:cy="225.86218"
+ sodipodi:cx="466.5"
+ id="path2294"
+ style="fill:#babdb6;stroke:none;stroke-width:3.83500004;stroke-miterlimit:4;stroke-dasharray:none"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="fill:#babdb6;stroke:none;stroke-width:3.83500004;stroke-miterlimit:4;stroke-dasharray:none"
+ id="path2296"
+ sodipodi:cx="466.5"
+ sodipodi:cy="225.86218"
+ sodipodi:rx="13.5"
+ sodipodi:ry="13.5"
+ d="M 480 225.86218 A 13.5 13.5 0 1 1 453,225.86218 A 13.5 13.5 0 1 1 480 225.86218 z"
+ transform="matrix(0.197327,0,0,0.197327,75.481,66.2218)" />
+ <path
+ id="path2268"
+ d="M 123.28125,123.9375 C 108.01533,124.16246 96.09738,141.26171 101.5625,155.78125 C 106.70498,169.34648 115.09976,183.17694 128.25,190.0625 C 135.00162,194.17566 144.81961,185.96654 141.5625,178.71875 C 146.27103,177.08945 143.82074,171.72239 144.9375,168.21875 C 146.8342,165.06946 153.71771,167.38783 153.46875,162.65625 C 150.74411,156.2047 144.57132,149.09618 147.96875,141.84375 C 145.2653,131.11182 134.46054,123.15696 123.28125,123.9375 z "
+ style="opacity:1;fill:none;fill-opacity:1;stroke:url(#linearGradient1463);stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ id="path2291"
+ d="M 179.75,118.6875 C 172.45096,118.90303 164.83544,124.65883 164.375,131.90625 C 166.6736,137.32257 160.94739,141.95547 160.375,146.71875 C 162.45612,148.7109 167.71064,148.079 166.59375,152.46875 C 165.32221,155.0163 168.12471,156.86409 168.52359,158.40373 C 166.89871,163.94225 174.72741,168.088 178.96875,164.46875 C 188.37541,158.20668 195.59314,147.55282 197.375,136.46875 C 198.06704,126.67227 189.35755,118.04285 179.75,118.6875 z "
+ style="fill:none;fill-opacity:1;stroke:url(#linearGradient1465);stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ </g>
+</svg>
diff --git a/src/empathy-chat-main.c b/src/empathy-chat-main.c
index fedc9066a..7750b0b3f 100644
--- a/src/empathy-chat-main.c
+++ b/src/empathy-chat-main.c
@@ -185,6 +185,8 @@ main (int argc, char *argv[])
GNOME_PARAM_HUMAN_READABLE_NAME, PACKAGE_NAME,
NULL);
+ gtk_window_set_default_icon_name ("empathy");
+
if (g_getenv ("EMPATHY_DEBUG")) {
debug_mode = TRUE;
}
diff --git a/src/empathy-main.c b/src/empathy-main.c
index 0804fe817..a49611123 100644
--- a/src/empathy-main.c
+++ b/src/empathy-main.c
@@ -166,6 +166,8 @@ main (int argc, char *argv[])
GNOME_PARAM_HUMAN_READABLE_NAME, PACKAGE_NAME,
NULL);
+ gtk_window_set_default_icon_name ("empathy");
+
/* Setting up channel filter */
filter = empathy_filter_new ();
g_signal_connect (filter, "new-channel",