Tue, 12 Oct 2021 03:50:01 -0500
Use icon names for chat emblems
Testing Done:
Joined devel@conference.pidgin.im and saw op/half-op/voice emblems on chat list. Not sure about the unassigned emblem as nobody has no role there.
Reviewed at https://reviews.imfreedom.org/r/1035/
|
20147
66f05a854eee
applied changes from 8a731bbd0197fbcc91a705c2d8f528154216defa
Richard Laager <rlaager@pidgin.im>
parents:
19859
diff
changeset
|
1 | /* pidgin |
| 10297 | 2 | * |
|
15930
d851247cb931
Install pixmaps to the right directories and make them load properly.
Richard Laager <rlaager@pidgin.im>
parents:
15914
diff
changeset
|
3 | * Pidgin is the legal property of its developers, whose names are too numerous |
| 10297 | 4 | * to list here. Please refer to the COPYRIGHT file distributed with this |
| 5 | * source distribution. | |
| 6 | * | |
| 7 | * This program is free software; you can redistribute it and/or modify | |
| 8 | * it under the terms of the GNU General Public License as published by | |
| 9 | * the Free Software Foundation; either version 2 of the License, or | |
| 10 | * (at your option) any later version. | |
| 11 | * | |
| 12 | * This program is distributed in the hope that it will be useful, | |
| 13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 15 | * GNU General Public License for more details. | |
| 16 | * | |
| 17 | * You should have received a copy of the GNU General Public License | |
| 18 | * along with this program; if not, write to the Free Software | |
|
19859
71d37b57eff2
The FSF changed its address a while ago; our files were out of date.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
19667
diff
changeset
|
19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
| 10297 | 20 | * |
| 21 | */ | |
|
40439
e9838d634d5e
Make sure that internal.h can only be included by libpurple and split out some pieces to purpleprivate.h
Gary Kramlich <grim@reaperworld.com>
parents:
40360
diff
changeset
|
22 | #ifdef HAVE_CONFIG_H |
|
e9838d634d5e
Make sure that internal.h can only be included by libpurple and split out some pieces to purpleprivate.h
Gary Kramlich <grim@reaperworld.com>
parents:
40360
diff
changeset
|
23 | # include <config.h> |
|
e9838d634d5e
Make sure that internal.h can only be included by libpurple and split out some pieces to purpleprivate.h
Gary Kramlich <grim@reaperworld.com>
parents:
40360
diff
changeset
|
24 | #endif |
|
e9838d634d5e
Make sure that internal.h can only be included by libpurple and split out some pieces to purpleprivate.h
Gary Kramlich <grim@reaperworld.com>
parents:
40360
diff
changeset
|
25 | |
|
e9838d634d5e
Make sure that internal.h can only be included by libpurple and split out some pieces to purpleprivate.h
Gary Kramlich <grim@reaperworld.com>
parents:
40360
diff
changeset
|
26 | #include <glib/gi18n-lib.h> |
|
e9838d634d5e
Make sure that internal.h can only be included by libpurple and split out some pieces to purpleprivate.h
Gary Kramlich <grim@reaperworld.com>
parents:
40360
diff
changeset
|
27 | |
|
e9838d634d5e
Make sure that internal.h can only be included by libpurple and split out some pieces to purpleprivate.h
Gary Kramlich <grim@reaperworld.com>
parents:
40360
diff
changeset
|
28 | #include <purple.h> |
|
e9838d634d5e
Make sure that internal.h can only be included by libpurple and split out some pieces to purpleprivate.h
Gary Kramlich <grim@reaperworld.com>
parents:
40360
diff
changeset
|
29 | |
|
40496
6941fece679b
phase2 of pidgin.h: move existing file to pidgincore.h
Gary Kramlich <grim@reaperworld.com>
parents:
40474
diff
changeset
|
30 | #include "pidginstock.h" |
|
23964
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
31 | |
|
24377
8d0bfda8402d
renamed gtkblist-loader.[ch] to gtblist-theme-loader.[ch]
Gary Kramlich <grim@reaperworld.com>
parents:
24376
diff
changeset
|
32 | #include "gtkicon-theme-loader.h" |
|
40496
6941fece679b
phase2 of pidgin.h: move existing file to pidgincore.h
Gary Kramlich <grim@reaperworld.com>
parents:
40474
diff
changeset
|
33 | #include "pidgincore.h" |
| 10297 | 34 | |
|
39030
a2b1c1a2ac86
pidginstock: Silence excessive GtkStock deprecation warnings
Mike Ruprecht <cmaiku@gmail.com>
parents:
38358
diff
changeset
|
35 | #warning GtkStock is deprecated. Port usage of PidginStock to GtkIconTheme \ |
|
a2b1c1a2ac86
pidginstock: Silence excessive GtkStock deprecation warnings
Mike Ruprecht <cmaiku@gmail.com>
parents:
38358
diff
changeset
|
36 | and friends. |
|
a2b1c1a2ac86
pidginstock: Silence excessive GtkStock deprecation warnings
Mike Ruprecht <cmaiku@gmail.com>
parents:
38358
diff
changeset
|
37 | |
|
23964
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
38 | /************************************************************************** |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
39 | * Globals |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
40 | **************************************************************************/ |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
41 | |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
42 | static gboolean stock_initted = FALSE; |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
43 | static GtkIconSize microscopic, extra_small, small, medium, large, huge; |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
44 | |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
45 | /************************************************************************** |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
46 | * Structures |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
47 | **************************************************************************/ |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
48 | |
|
39030
a2b1c1a2ac86
pidginstock: Silence excessive GtkStock deprecation warnings
Mike Ruprecht <cmaiku@gmail.com>
parents:
38358
diff
changeset
|
49 | G_GNUC_BEGIN_IGNORE_DEPRECATIONS |
| 10297 | 50 | static struct StockIcon |
| 51 | { | |
| 52 | const char *name; | |
| 53 | const char *dir; | |
| 54 | const char *filename; | |
| 55 | ||
|
23964
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
56 | } const stock_icons[] = { |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
57 | |
| 15570 | 58 | { PIDGIN_STOCK_ACTION, NULL, GTK_STOCK_EXECUTE }, |
| 59 | { PIDGIN_STOCK_ALIAS, NULL, GTK_STOCK_EDIT }, | |
| 60 | { PIDGIN_STOCK_CHAT, NULL, GTK_STOCK_JUMP_TO }, | |
| 61 | { PIDGIN_STOCK_CLEAR, NULL, GTK_STOCK_CLEAR }, | |
|
19117
c55d71840e82
Remove reference to close-tab.png
Sean Egan <seanegan@pidgin.im>
parents:
19092
diff
changeset
|
62 | { PIDGIN_STOCK_CLOSE_TABS, NULL, GTK_STOCK_CLOSE }, |
| 15570 | 63 | { PIDGIN_STOCK_DEBUG, NULL, GTK_STOCK_PROPERTIES }, |
| 64 | { PIDGIN_STOCK_DOWNLOAD, NULL, GTK_STOCK_GO_DOWN }, | |
| 65 | { PIDGIN_STOCK_DISCONNECT, NULL, GTK_STOCK_DISCONNECT }, | |
| 66 | { PIDGIN_STOCK_FGCOLOR, "buttons", "change-fgcolor-small.png" }, | |
| 67 | { PIDGIN_STOCK_EDIT, NULL, GTK_STOCK_EDIT }, | |
|
35511
201a7fd12507
Use "Cancelled" as spelling of stock item.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35454
diff
changeset
|
68 | { PIDGIN_STOCK_FILE_CANCELLED, NULL, GTK_STOCK_CANCEL }, |
| 15570 | 69 | { PIDGIN_STOCK_FILE_DONE, NULL, GTK_STOCK_APPLY }, |
| 70 | { PIDGIN_STOCK_IGNORE, NULL, GTK_STOCK_DIALOG_ERROR }, | |
| 71 | { PIDGIN_STOCK_INVITE, NULL, GTK_STOCK_JUMP_TO }, | |
| 72 | { PIDGIN_STOCK_MODIFY, NULL, GTK_STOCK_PREFERENCES }, | |
|
33548
3d2454150223
Specify the gettext package explicitly for stock items.
Daniel Atallah <datallah@pidgin.im>
parents:
29759
diff
changeset
|
73 | { PIDGIN_STOCK_ADD, NULL, GTK_STOCK_ADD }, |
| 15570 | 74 | { PIDGIN_STOCK_PAUSE, NULL, GTK_STOCK_MEDIA_PAUSE }, |
| 75 | { PIDGIN_STOCK_OPEN_MAIL, NULL, GTK_STOCK_JUMP_TO }, | |
| 76 | { PIDGIN_STOCK_SIGN_ON, NULL, GTK_STOCK_EXECUTE }, | |
| 77 | { PIDGIN_STOCK_SIGN_OFF, NULL, GTK_STOCK_CLOSE }, | |
|
15930
d851247cb931
Install pixmaps to the right directories and make them load properly.
Richard Laager <rlaager@pidgin.im>
parents:
15914
diff
changeset
|
78 | { PIDGIN_STOCK_TYPED, "pidgin", "typed.png" }, |
| 15570 | 79 | { PIDGIN_STOCK_UPLOAD, NULL, GTK_STOCK_GO_UP }, |
|
19667
4a8d8a6bd2b0
Make the gtkcert stuff compile on GTK+ older than 2.8
Daniel Atallah <datallah@pidgin.im>
parents:
19651
diff
changeset
|
80 | { PIDGIN_STOCK_INFO, NULL, GTK_STOCK_INFO }, |
|
34343
225d5c9642d1
Polish back/next stock items a bit
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
34308
diff
changeset
|
81 | { PIDGIN_STOCK_NEXT, NULL, GTK_STOCK_GO_FORWARD }, |
| 10297 | 82 | }; |
|
39030
a2b1c1a2ac86
pidginstock: Silence excessive GtkStock deprecation warnings
Mike Ruprecht <cmaiku@gmail.com>
parents:
38358
diff
changeset
|
83 | G_GNUC_END_IGNORE_DEPRECATIONS |
| 10297 | 84 | |
|
10871
c0282a4f2250
[gaim-migrate @ 12558]
Mark Doliner <markdoliner@pidgin.im>
parents:
10643
diff
changeset
|
85 | static const GtkStockItem stock_items[] = |
| 10297 | 86 | { |
|
33548
3d2454150223
Specify the gettext package explicitly for stock items.
Daniel Atallah <datallah@pidgin.im>
parents:
29759
diff
changeset
|
87 | { PIDGIN_STOCK_ALIAS, N_("_Alias"), 0, 0, PACKAGE }, |
|
3d2454150223
Specify the gettext package explicitly for stock items.
Daniel Atallah <datallah@pidgin.im>
parents:
29759
diff
changeset
|
88 | { PIDGIN_STOCK_CHAT, N_("_Join"), 0, 0, PACKAGE }, |
|
3d2454150223
Specify the gettext package explicitly for stock items.
Daniel Atallah <datallah@pidgin.im>
parents:
29759
diff
changeset
|
89 | { PIDGIN_STOCK_CLOSE_TABS, N_("Close _tabs"), 0, 0, PACKAGE }, |
|
3d2454150223
Specify the gettext package explicitly for stock items.
Daniel Atallah <datallah@pidgin.im>
parents:
29759
diff
changeset
|
90 | { PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW, N_("I_M"), 0, 0, PACKAGE }, |
|
3d2454150223
Specify the gettext package explicitly for stock items.
Daniel Atallah <datallah@pidgin.im>
parents:
29759
diff
changeset
|
91 | { PIDGIN_STOCK_TOOLBAR_USER_INFO, N_("_Get Info"), 0, 0, PACKAGE }, |
|
3d2454150223
Specify the gettext package explicitly for stock items.
Daniel Atallah <datallah@pidgin.im>
parents:
29759
diff
changeset
|
92 | { PIDGIN_STOCK_INVITE, N_("_Invite"), 0, 0, PACKAGE }, |
|
3d2454150223
Specify the gettext package explicitly for stock items.
Daniel Atallah <datallah@pidgin.im>
parents:
29759
diff
changeset
|
93 | { PIDGIN_STOCK_MODIFY, N_("_Modify..."), 0, 0, PACKAGE }, |
|
3d2454150223
Specify the gettext package explicitly for stock items.
Daniel Atallah <datallah@pidgin.im>
parents:
29759
diff
changeset
|
94 | { PIDGIN_STOCK_ADD, N_("_Add..."), 0, 0, PACKAGE }, |
|
3d2454150223
Specify the gettext package explicitly for stock items.
Daniel Atallah <datallah@pidgin.im>
parents:
29759
diff
changeset
|
95 | { PIDGIN_STOCK_OPEN_MAIL, N_("_Open Mail"), 0, 0, PACKAGE }, |
|
3d2454150223
Specify the gettext package explicitly for stock items.
Daniel Atallah <datallah@pidgin.im>
parents:
29759
diff
changeset
|
96 | { PIDGIN_STOCK_PAUSE, N_("_Pause"), 0, 0, PACKAGE }, |
|
34343
225d5c9642d1
Polish back/next stock items a bit
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
34308
diff
changeset
|
97 | { PIDGIN_STOCK_EDIT, N_("_Edit"), 0, 0, PACKAGE }, |
|
225d5c9642d1
Polish back/next stock items a bit
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
34308
diff
changeset
|
98 | { PIDGIN_STOCK_NEXT, N_("_Next"), 0, 0, PACKAGE }, |
| 10297 | 99 | }; |
| 100 | ||
| 26338 | 101 | typedef struct { |
|
27262
ce9c568ee33c
A few bits of whitespace changes...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26843
diff
changeset
|
102 | const char *name; |
|
33133
9a31f084f259
Fix some merge errors.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32438
diff
changeset
|
103 | const char *dir; |
|
27262
ce9c568ee33c
A few bits of whitespace changes...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26843
diff
changeset
|
104 | const char *filename; |
|
ce9c568ee33c
A few bits of whitespace changes...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26843
diff
changeset
|
105 | gboolean microscopic; |
|
ce9c568ee33c
A few bits of whitespace changes...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26843
diff
changeset
|
106 | gboolean extra_small; |
|
ce9c568ee33c
A few bits of whitespace changes...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26843
diff
changeset
|
107 | gboolean small; |
|
ce9c568ee33c
A few bits of whitespace changes...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26843
diff
changeset
|
108 | gboolean medium; |
|
ce9c568ee33c
A few bits of whitespace changes...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26843
diff
changeset
|
109 | gboolean large; |
|
ce9c568ee33c
A few bits of whitespace changes...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26843
diff
changeset
|
110 | gboolean huge; |
|
ce9c568ee33c
A few bits of whitespace changes...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26843
diff
changeset
|
111 | gboolean rtl; |
|
ce9c568ee33c
A few bits of whitespace changes...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26843
diff
changeset
|
112 | const char *translucent_name; |
| 26338 | 113 | } SizedStockIcon; |
| 114 | ||
| 115 | const SizedStockIcon sized_stock_icons [] = { | |
| 116 | ||
|
39038
036994f402eb
Move toolbar icons to actions icon theme specification directory
Mike Ruprecht <cmaiku@gmail.com>
parents:
39037
diff
changeset
|
117 | { PIDGIN_STOCK_TOOLBAR_BGCOLOR, "actions", "change-bgcolor.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL }, |
|
39039
355cbde54abf
Move emblem icons to emblems icon theme specification directory
Mike Ruprecht <cmaiku@gmail.com>
parents:
39038
diff
changeset
|
118 | { PIDGIN_STOCK_TOOLBAR_BLOCK, "emblems", "emblem-blocked.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL }, |
|
39038
036994f402eb
Move toolbar icons to actions icon theme specification directory
Mike Ruprecht <cmaiku@gmail.com>
parents:
39037
diff
changeset
|
119 | { PIDGIN_STOCK_TOOLBAR_FGCOLOR, "actions", "change-fgcolor.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL }, |
|
036994f402eb
Move toolbar icons to actions icon theme specification directory
Mike Ruprecht <cmaiku@gmail.com>
parents:
39037
diff
changeset
|
120 | { PIDGIN_STOCK_TOOLBAR_FONT_FACE, "actions", "font-face.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL }, |
|
036994f402eb
Move toolbar icons to actions icon theme specification directory
Mike Ruprecht <cmaiku@gmail.com>
parents:
39037
diff
changeset
|
121 | { PIDGIN_STOCK_TOOLBAR_TEXT_SMALLER, "actions", "font-size-down.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL }, |
|
036994f402eb
Move toolbar icons to actions icon theme specification directory
Mike Ruprecht <cmaiku@gmail.com>
parents:
39037
diff
changeset
|
122 | { PIDGIN_STOCK_TOOLBAR_TEXT_LARGER, "actions", "font-size-up.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL }, |
|
036994f402eb
Move toolbar icons to actions icon theme specification directory
Mike Ruprecht <cmaiku@gmail.com>
parents:
39037
diff
changeset
|
123 | { PIDGIN_STOCK_TOOLBAR_INSERT, "actions", "insert.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL }, |
|
036994f402eb
Move toolbar icons to actions icon theme specification directory
Mike Ruprecht <cmaiku@gmail.com>
parents:
39037
diff
changeset
|
124 | { PIDGIN_STOCK_TOOLBAR_INSERT_IMAGE, "actions", "insert-image.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL }, |
|
036994f402eb
Move toolbar icons to actions icon theme specification directory
Mike Ruprecht <cmaiku@gmail.com>
parents:
39037
diff
changeset
|
125 | { PIDGIN_STOCK_TOOLBAR_INSERT_SCREENSHOT, "actions", "insert-screenshot.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL }, |
|
036994f402eb
Move toolbar icons to actions icon theme specification directory
Mike Ruprecht <cmaiku@gmail.com>
parents:
39037
diff
changeset
|
126 | { PIDGIN_STOCK_TOOLBAR_INSERT_LINK, "actions", "insert-link.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL }, |
|
036994f402eb
Move toolbar icons to actions icon theme specification directory
Mike Ruprecht <cmaiku@gmail.com>
parents:
39037
diff
changeset
|
127 | { PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW, "actions", "message-new.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL }, |
|
036994f402eb
Move toolbar icons to actions icon theme specification directory
Mike Ruprecht <cmaiku@gmail.com>
parents:
39037
diff
changeset
|
128 | { PIDGIN_STOCK_TOOLBAR_PENDING, "actions", "message-new.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL }, |
|
036994f402eb
Move toolbar icons to actions icon theme specification directory
Mike Ruprecht <cmaiku@gmail.com>
parents:
39037
diff
changeset
|
129 | { PIDGIN_STOCK_TOOLBAR_PLUGINS, "actions", "plugins.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL }, |
|
036994f402eb
Move toolbar icons to actions icon theme specification directory
Mike Ruprecht <cmaiku@gmail.com>
parents:
39037
diff
changeset
|
130 | { PIDGIN_STOCK_TOOLBAR_UNBLOCK, "actions", "unblock.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL }, |
|
036994f402eb
Move toolbar icons to actions icon theme specification directory
Mike Ruprecht <cmaiku@gmail.com>
parents:
39037
diff
changeset
|
131 | { PIDGIN_STOCK_TOOLBAR_SELECT_AVATAR, "actions", "select-avatar.png", FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, NULL }, |
|
036994f402eb
Move toolbar icons to actions icon theme specification directory
Mike Ruprecht <cmaiku@gmail.com>
parents:
39037
diff
changeset
|
132 | { PIDGIN_STOCK_TOOLBAR_SEND_FILE, "actions", "send-file.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL }, |
|
036994f402eb
Move toolbar icons to actions icon theme specification directory
Mike Ruprecht <cmaiku@gmail.com>
parents:
39037
diff
changeset
|
133 | { PIDGIN_STOCK_TOOLBAR_TRANSFER, "actions", "transfer.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL }, |
| 26338 | 134 | #ifdef USE_VV |
|
39038
036994f402eb
Move toolbar icons to actions icon theme specification directory
Mike Ruprecht <cmaiku@gmail.com>
parents:
39037
diff
changeset
|
135 | { PIDGIN_STOCK_TOOLBAR_AUDIO_CALL, "actions", "audio-call.png", FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL }, |
|
036994f402eb
Move toolbar icons to actions icon theme specification directory
Mike Ruprecht <cmaiku@gmail.com>
parents:
39037
diff
changeset
|
136 | { PIDGIN_STOCK_TOOLBAR_VIDEO_CALL, "actions", "video-call.png", FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL }, |
|
036994f402eb
Move toolbar icons to actions icon theme specification directory
Mike Ruprecht <cmaiku@gmail.com>
parents:
39037
diff
changeset
|
137 | { PIDGIN_STOCK_TOOLBAR_AUDIO_VIDEO_CALL, "actions", "audio-video-call.png", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL }, |
| 26338 | 138 | #endif |
|
39038
036994f402eb
Move toolbar icons to actions icon theme specification directory
Mike Ruprecht <cmaiku@gmail.com>
parents:
39037
diff
changeset
|
139 | { PIDGIN_STOCK_TOOLBAR_SEND_ATTENTION, "actions", "get-attention.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL } |
|
15458
39c79dc7c965
A lot of status icon changes:
Sean Egan <seanegan@pidgin.im>
parents:
15435
diff
changeset
|
140 | }; |
|
39c79dc7c965
A lot of status icon changes:
Sean Egan <seanegan@pidgin.im>
parents:
15435
diff
changeset
|
141 | |
|
23964
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
142 | const SizedStockIcon sized_status_icons [] = { |
|
16068
b1dac315ed09
block and unblock have the right icons now
Nathan Walp <nwalp@pidgin.im>
parents:
15930
diff
changeset
|
143 | |
|
39037
5014cd8d58e3
Move status icons to the status icon theme specification directory
Mike Ruprecht <cmaiku@gmail.com>
parents:
39035
diff
changeset
|
144 | { PIDGIN_STOCK_STATUS_AVAILABLE, "status", "user-available.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, PIDGIN_STOCK_STATUS_AVAILABLE_I }, |
|
5014cd8d58e3
Move status icons to the status icon theme specification directory
Mike Ruprecht <cmaiku@gmail.com>
parents:
39035
diff
changeset
|
145 | { PIDGIN_STOCK_STATUS_AWAY, "status", "user-away.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, PIDGIN_STOCK_STATUS_AWAY_I }, |
|
5014cd8d58e3
Move status icons to the status icon theme specification directory
Mike Ruprecht <cmaiku@gmail.com>
parents:
39035
diff
changeset
|
146 | { PIDGIN_STOCK_STATUS_BUSY, "status", "user-busy.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, PIDGIN_STOCK_STATUS_BUSY_I }, |
|
27262
ce9c568ee33c
A few bits of whitespace changes...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26843
diff
changeset
|
147 | { PIDGIN_STOCK_STATUS_CHAT, "status", "chat.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL }, |
|
39037
5014cd8d58e3
Move status icons to the status icon theme specification directory
Mike Ruprecht <cmaiku@gmail.com>
parents:
39035
diff
changeset
|
148 | { PIDGIN_STOCK_STATUS_INVISIBLE, "status", "user-invisible.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL }, |
|
5014cd8d58e3
Move status icons to the status icon theme specification directory
Mike Ruprecht <cmaiku@gmail.com>
parents:
39035
diff
changeset
|
149 | { PIDGIN_STOCK_STATUS_XA, "status", "user-extended-away.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, PIDGIN_STOCK_STATUS_XA_I }, |
|
27262
ce9c568ee33c
A few bits of whitespace changes...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26843
diff
changeset
|
150 | { PIDGIN_STOCK_STATUS_LOGIN, "status", "log-in.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, NULL }, |
|
ce9c568ee33c
A few bits of whitespace changes...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26843
diff
changeset
|
151 | { PIDGIN_STOCK_STATUS_LOGOUT, "status", "log-out.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, NULL }, |
|
39037
5014cd8d58e3
Move status icons to the status icon theme specification directory
Mike Ruprecht <cmaiku@gmail.com>
parents:
39035
diff
changeset
|
152 | { PIDGIN_STOCK_STATUS_OFFLINE, "status", "user-offline.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, PIDGIN_STOCK_STATUS_OFFLINE_I }, |
|
27262
ce9c568ee33c
A few bits of whitespace changes...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26843
diff
changeset
|
153 | { PIDGIN_STOCK_STATUS_PERSON, "status", "person.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL }, |
|
39038
036994f402eb
Move toolbar icons to actions icon theme specification directory
Mike Ruprecht <cmaiku@gmail.com>
parents:
39037
diff
changeset
|
154 | { PIDGIN_STOCK_STATUS_MESSAGE, "actions", "message-new.png", TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL } |
|
29641
e54552cf87d8
Use GtkStatusIcon on GTK+ 2.10+. That's actually the required version for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29514
diff
changeset
|
155 | }; |
|
e54552cf87d8
Use GtkStatusIcon on GTK+ 2.10+. That's actually the required version for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29514
diff
changeset
|
156 | |
|
e54552cf87d8
Use GtkStatusIcon on GTK+ 2.10+. That's actually the required version for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29514
diff
changeset
|
157 | const SizedStockIcon sized_tray_icons [] = { |
|
29707
f9d7d4373550
Make sure that the stock loader uses the new location of the tray icons
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29705
diff
changeset
|
158 | #define SIZED_TRAY_ICON(name) \ |
|
39045
ad2b0e960d3c
Move tray icons to status directory of the icon theme specification
Mike Ruprecht <cmaiku@gmail.com>
parents:
39041
diff
changeset
|
159 | { name, "status", name ".png", FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL } |
|
29707
f9d7d4373550
Make sure that the stock loader uses the new location of the tray icons
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29705
diff
changeset
|
160 | SIZED_TRAY_ICON( PIDGIN_STOCK_TRAY_AVAILABLE ), |
|
f9d7d4373550
Make sure that the stock loader uses the new location of the tray icons
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29705
diff
changeset
|
161 | SIZED_TRAY_ICON( PIDGIN_STOCK_TRAY_INVISIBLE ), |
|
f9d7d4373550
Make sure that the stock loader uses the new location of the tray icons
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29705
diff
changeset
|
162 | SIZED_TRAY_ICON( PIDGIN_STOCK_TRAY_AWAY ), |
|
f9d7d4373550
Make sure that the stock loader uses the new location of the tray icons
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29705
diff
changeset
|
163 | SIZED_TRAY_ICON( PIDGIN_STOCK_TRAY_BUSY ), |
|
f9d7d4373550
Make sure that the stock loader uses the new location of the tray icons
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29705
diff
changeset
|
164 | SIZED_TRAY_ICON( PIDGIN_STOCK_TRAY_XA ), |
|
f9d7d4373550
Make sure that the stock loader uses the new location of the tray icons
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29705
diff
changeset
|
165 | SIZED_TRAY_ICON( PIDGIN_STOCK_TRAY_OFFLINE ), |
|
f9d7d4373550
Make sure that the stock loader uses the new location of the tray icons
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29705
diff
changeset
|
166 | SIZED_TRAY_ICON( PIDGIN_STOCK_TRAY_CONNECT ), |
|
f9d7d4373550
Make sure that the stock loader uses the new location of the tray icons
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29705
diff
changeset
|
167 | SIZED_TRAY_ICON( PIDGIN_STOCK_TRAY_PENDING ), |
|
f9d7d4373550
Make sure that the stock loader uses the new location of the tray icons
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29705
diff
changeset
|
168 | SIZED_TRAY_ICON( PIDGIN_STOCK_TRAY_EMAIL ) |
|
f9d7d4373550
Make sure that the stock loader uses the new location of the tray icons
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29705
diff
changeset
|
169 | #undef SIZED_TRAY_ICON |
|
15458
39c79dc7c965
A lot of status icon changes:
Sean Egan <seanegan@pidgin.im>
parents:
15435
diff
changeset
|
170 | }; |
|
39c79dc7c965
A lot of status icon changes:
Sean Egan <seanegan@pidgin.im>
parents:
15435
diff
changeset
|
171 | |
|
23964
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
172 | /***************************************************************************** |
|
25888
d0fdd378a635
Remove trailing whitespace
Mark Doliner <markdoliner@pidgin.im>
parents:
25000
diff
changeset
|
173 | * Private functions |
|
23964
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
174 | *****************************************************************************/ |
|
24696
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
175 | |
|
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
176 | static gchar * |
|
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
177 | find_file_common(const char *name) |
|
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
178 | { |
|
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
179 | gchar *filename; |
|
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
180 | const gchar *userdir; |
|
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
181 | const gchar * const *sysdirs; |
|
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
182 | |
|
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
183 | userdir = g_get_user_data_dir(); |
|
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
184 | filename = g_build_filename(userdir, name, NULL); |
|
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
185 | if (g_file_test(filename, G_FILE_TEST_EXISTS)) |
|
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
186 | return filename; |
|
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
187 | g_free(filename); |
|
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
188 | |
|
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
189 | sysdirs = g_get_system_data_dirs(); |
|
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
190 | for (; *sysdirs; sysdirs++) { |
|
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
191 | filename = g_build_filename(*sysdirs, name, NULL); |
|
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
192 | if (g_file_test(filename, G_FILE_TEST_EXISTS)) |
|
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
193 | return filename; |
|
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
194 | g_free(filename); |
|
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
195 | } |
|
35850
1abeda205d6c
cross-win32: make dirs more flexible, add them to the config.h
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35511
diff
changeset
|
196 | filename = g_build_filename(PURPLE_DATADIR, name, NULL); |
|
24696
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
197 | if (g_file_test(filename, G_FILE_TEST_EXISTS)) |
|
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
198 | return filename; |
|
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
199 | g_free(filename); |
|
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
200 | return NULL; |
|
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
201 | } |
|
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
202 | |
| 10297 | 203 | static gchar * |
| 204 | find_file(const char *dir, const char *base) | |
| 205 | { | |
| 206 | char *filename; | |
|
24696
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
207 | char *ret; |
| 10297 | 208 | |
| 209 | if (base == NULL) | |
| 210 | return NULL; | |
| 211 | ||
|
38258
9a6551eba09c
Replace !strcmp() with purple_strequal()
qarkai <qarkai@gmail.com>
parents:
36256
diff
changeset
|
212 | if (purple_strequal(dir, "pidgin")) |
|
24696
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
213 | filename = g_build_filename("pixmaps", "pidgin", base, NULL); |
| 10297 | 214 | else |
|
24696
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
215 | filename = g_build_filename("pixmaps", "pidgin", dir, base, NULL); |
| 10297 | 216 | |
|
24696
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
217 | ret = find_file_common(filename); |
|
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
218 | g_free(filename); |
|
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
219 | return ret; |
|
15458
39c79dc7c965
A lot of status icon changes:
Sean Egan <seanegan@pidgin.im>
parents:
15435
diff
changeset
|
220 | } |
|
39c79dc7c965
A lot of status icon changes:
Sean Egan <seanegan@pidgin.im>
parents:
15435
diff
changeset
|
221 | |
|
26482
72d16a73cf12
Get rid of the rest of the extraneous changes.
Michael Ruprecht <maiku@pidgin.im>
parents:
26338
diff
changeset
|
222 | |
|
16484
4c91c9a40dea
Don't use translucent pixmaps for idle, but apply transparency to icons in pidginstock.c
Sean Egan <seanegan@pidgin.im>
parents:
16454
diff
changeset
|
223 | /* Altered from do_colorshift in gnome-panel */ |
|
4c91c9a40dea
Don't use translucent pixmaps for idle, but apply transparency to icons in pidginstock.c
Sean Egan <seanegan@pidgin.im>
parents:
16454
diff
changeset
|
224 | static void |
|
29759
89d25a5185e9
Simplify: dest always equals src. No need to copy everything.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29707
diff
changeset
|
225 | do_alphashift(GdkPixbuf *pixbuf) |
|
16484
4c91c9a40dea
Don't use translucent pixmaps for idle, but apply transparency to icons in pidginstock.c
Sean Egan <seanegan@pidgin.im>
parents:
16454
diff
changeset
|
226 | { |
|
27262
ce9c568ee33c
A few bits of whitespace changes...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26843
diff
changeset
|
227 | gint i, j; |
|
29759
89d25a5185e9
Simplify: dest always equals src. No need to copy everything.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29707
diff
changeset
|
228 | gint width, height, padding; |
|
89d25a5185e9
Simplify: dest always equals src. No need to copy everything.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29707
diff
changeset
|
229 | guchar *pixels; |
|
27262
ce9c568ee33c
A few bits of whitespace changes...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26843
diff
changeset
|
230 | guchar a; |
|
16484
4c91c9a40dea
Don't use translucent pixmaps for idle, but apply transparency to icons in pidginstock.c
Sean Egan <seanegan@pidgin.im>
parents:
16454
diff
changeset
|
231 | |
|
29759
89d25a5185e9
Simplify: dest always equals src. No need to copy everything.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29707
diff
changeset
|
232 | if (!gdk_pixbuf_get_has_alpha(pixbuf)) |
|
27262
ce9c568ee33c
A few bits of whitespace changes...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26843
diff
changeset
|
233 | return; |
|
16484
4c91c9a40dea
Don't use translucent pixmaps for idle, but apply transparency to icons in pidginstock.c
Sean Egan <seanegan@pidgin.im>
parents:
16454
diff
changeset
|
234 | |
|
29759
89d25a5185e9
Simplify: dest always equals src. No need to copy everything.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29707
diff
changeset
|
235 | width = gdk_pixbuf_get_width(pixbuf); |
|
89d25a5185e9
Simplify: dest always equals src. No need to copy everything.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29707
diff
changeset
|
236 | height = gdk_pixbuf_get_height(pixbuf); |
|
89d25a5185e9
Simplify: dest always equals src. No need to copy everything.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29707
diff
changeset
|
237 | padding = gdk_pixbuf_get_rowstride(pixbuf) - width * 4; |
|
89d25a5185e9
Simplify: dest always equals src. No need to copy everything.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29707
diff
changeset
|
238 | pixels = gdk_pixbuf_get_pixels(pixbuf); |
|
16484
4c91c9a40dea
Don't use translucent pixmaps for idle, but apply transparency to icons in pidginstock.c
Sean Egan <seanegan@pidgin.im>
parents:
16454
diff
changeset
|
239 | |
|
27262
ce9c568ee33c
A few bits of whitespace changes...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26843
diff
changeset
|
240 | for (i = 0; i < height; i++) { |
|
ce9c568ee33c
A few bits of whitespace changes...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26843
diff
changeset
|
241 | for (j = 0; j < width; j++) { |
|
29759
89d25a5185e9
Simplify: dest always equals src. No need to copy everything.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29707
diff
changeset
|
242 | pixels++; |
|
89d25a5185e9
Simplify: dest always equals src. No need to copy everything.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29707
diff
changeset
|
243 | pixels++; |
|
89d25a5185e9
Simplify: dest always equals src. No need to copy everything.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29707
diff
changeset
|
244 | pixels++; |
|
89d25a5185e9
Simplify: dest always equals src. No need to copy everything.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29707
diff
changeset
|
245 | a = *(pixels); |
|
89d25a5185e9
Simplify: dest always equals src. No need to copy everything.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29707
diff
changeset
|
246 | *(pixels++) = a / 2; |
|
27262
ce9c568ee33c
A few bits of whitespace changes...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26843
diff
changeset
|
247 | } |
|
29759
89d25a5185e9
Simplify: dest always equals src. No need to copy everything.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29707
diff
changeset
|
248 | pixels += padding; |
|
27262
ce9c568ee33c
A few bits of whitespace changes...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26843
diff
changeset
|
249 | } |
|
16484
4c91c9a40dea
Don't use translucent pixmaps for idle, but apply transparency to icons in pidginstock.c
Sean Egan <seanegan@pidgin.im>
parents:
16454
diff
changeset
|
250 | } |
|
4c91c9a40dea
Don't use translucent pixmaps for idle, but apply transparency to icons in pidginstock.c
Sean Egan <seanegan@pidgin.im>
parents:
16454
diff
changeset
|
251 | |
|
23965
13cd30de531b
Add the icon theme files, and re-work some things
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23964
diff
changeset
|
252 | static gchar * |
|
26813
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
253 | find_icon_file(PidginIconTheme *theme, const gchar *size, SizedStockIcon sized_icon, gboolean rtl) |
|
16484
4c91c9a40dea
Don't use translucent pixmaps for idle, but apply transparency to icons in pidginstock.c
Sean Egan <seanegan@pidgin.im>
parents:
16454
diff
changeset
|
254 | { |
|
23965
13cd30de531b
Add the icon theme files, and re-work some things
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23964
diff
changeset
|
255 | const gchar *file, *dir; |
|
13cd30de531b
Add the icon theme files, and re-work some things
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23964
diff
changeset
|
256 | gchar *file_full = NULL; |
|
24989
81e2345f35f3
Clean up the merge I just did.
Richard Laager <rlaager@pidgin.im>
parents:
24988
diff
changeset
|
257 | gchar *tmp; |
|
23965
13cd30de531b
Add the icon theme files, and re-work some things
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23964
diff
changeset
|
258 | |
|
13cd30de531b
Add the icon theme files, and re-work some things
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23964
diff
changeset
|
259 | if (theme != NULL) { |
|
23972
90e0da03c053
theme loader cleanup, and remove a few warnings
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23970
diff
changeset
|
260 | file = pidgin_icon_theme_get_icon(PIDGIN_ICON_THEME(theme), sized_icon.name); |
|
23965
13cd30de531b
Add the icon theme files, and re-work some things
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23964
diff
changeset
|
261 | dir = purple_theme_get_dir(PURPLE_THEME(theme)); |
|
13cd30de531b
Add the icon theme files, and re-work some things
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23964
diff
changeset
|
262 | |
|
13cd30de531b
Add the icon theme files, and re-work some things
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23964
diff
changeset
|
263 | if (rtl) |
|
13cd30de531b
Add the icon theme files, and re-work some things
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23964
diff
changeset
|
264 | file_full = g_build_filename(dir, size, "rtl", file, NULL); |
|
24988
4150b857c58b
explicit merge of '33d0b1c4806ab021469a1bccd95f2b753de3bc42'
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
265 | else |
|
4150b857c58b
explicit merge of '33d0b1c4806ab021469a1bccd95f2b753de3bc42'
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
266 | file_full = g_build_filename(dir, size, file, NULL); |
|
23965
13cd30de531b
Add the icon theme files, and re-work some things
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23964
diff
changeset
|
267 | |
|
25888
d0fdd378a635
Remove trailing whitespace
Mark Doliner <markdoliner@pidgin.im>
parents:
25000
diff
changeset
|
268 | if (g_file_test(file_full, G_FILE_TEST_IS_REGULAR)) |
|
23965
13cd30de531b
Add the icon theme files, and re-work some things
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23964
diff
changeset
|
269 | return file_full; |
|
13cd30de531b
Add the icon theme files, and re-work some things
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23964
diff
changeset
|
270 | |
|
13cd30de531b
Add the icon theme files, and re-work some things
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23964
diff
changeset
|
271 | g_free(file_full); |
|
24988
4150b857c58b
explicit merge of '33d0b1c4806ab021469a1bccd95f2b753de3bc42'
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
272 | } |
|
23965
13cd30de531b
Add the icon theme files, and re-work some things
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23964
diff
changeset
|
273 | |
|
13cd30de531b
Add the icon theme files, and re-work some things
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23964
diff
changeset
|
274 | if (rtl) |
|
24988
4150b857c58b
explicit merge of '33d0b1c4806ab021469a1bccd95f2b753de3bc42'
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
275 | tmp = g_build_filename("pixmaps", "pidgin", sized_icon.dir, size, "rtl", sized_icon.filename, NULL); |
|
4150b857c58b
explicit merge of '33d0b1c4806ab021469a1bccd95f2b753de3bc42'
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
276 | else |
|
4150b857c58b
explicit merge of '33d0b1c4806ab021469a1bccd95f2b753de3bc42'
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
277 | tmp = g_build_filename("pixmaps", "pidgin", sized_icon.dir, size, sized_icon.filename, NULL); |
|
4150b857c58b
explicit merge of '33d0b1c4806ab021469a1bccd95f2b753de3bc42'
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
278 | |
|
4150b857c58b
explicit merge of '33d0b1c4806ab021469a1bccd95f2b753de3bc42'
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
279 | file_full = find_file_common(tmp); |
|
4150b857c58b
explicit merge of '33d0b1c4806ab021469a1bccd95f2b753de3bc42'
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
280 | g_free(tmp); |
|
39035
38526dcaa0a7
pidginstock: Look in GtkIconTheme locations for icons
Mike Ruprecht <cmaiku@gmail.com>
parents:
39030
diff
changeset
|
281 | |
|
38526dcaa0a7
pidginstock: Look in GtkIconTheme locations for icons
Mike Ruprecht <cmaiku@gmail.com>
parents:
39030
diff
changeset
|
282 | if (file_full == NULL) { |
|
38526dcaa0a7
pidginstock: Look in GtkIconTheme locations for icons
Mike Ruprecht <cmaiku@gmail.com>
parents:
39030
diff
changeset
|
283 | gchar *size_dir = g_strdup_printf("%sx%s", size, size); |
|
38526dcaa0a7
pidginstock: Look in GtkIconTheme locations for icons
Mike Ruprecht <cmaiku@gmail.com>
parents:
39030
diff
changeset
|
284 | |
|
38526dcaa0a7
pidginstock: Look in GtkIconTheme locations for icons
Mike Ruprecht <cmaiku@gmail.com>
parents:
39030
diff
changeset
|
285 | if (rtl) |
|
38526dcaa0a7
pidginstock: Look in GtkIconTheme locations for icons
Mike Ruprecht <cmaiku@gmail.com>
parents:
39030
diff
changeset
|
286 | tmp = g_build_filename("pidgin", "icons", "hicolor", |
|
38526dcaa0a7
pidginstock: Look in GtkIconTheme locations for icons
Mike Ruprecht <cmaiku@gmail.com>
parents:
39030
diff
changeset
|
287 | size_dir, sized_icon.dir, "rtl", |
|
38526dcaa0a7
pidginstock: Look in GtkIconTheme locations for icons
Mike Ruprecht <cmaiku@gmail.com>
parents:
39030
diff
changeset
|
288 | sized_icon.filename, NULL); |
|
38526dcaa0a7
pidginstock: Look in GtkIconTheme locations for icons
Mike Ruprecht <cmaiku@gmail.com>
parents:
39030
diff
changeset
|
289 | else |
|
38526dcaa0a7
pidginstock: Look in GtkIconTheme locations for icons
Mike Ruprecht <cmaiku@gmail.com>
parents:
39030
diff
changeset
|
290 | tmp = g_build_filename("pidgin", "icons", "hicolor", |
|
38526dcaa0a7
pidginstock: Look in GtkIconTheme locations for icons
Mike Ruprecht <cmaiku@gmail.com>
parents:
39030
diff
changeset
|
291 | size_dir, sized_icon.dir, |
|
38526dcaa0a7
pidginstock: Look in GtkIconTheme locations for icons
Mike Ruprecht <cmaiku@gmail.com>
parents:
39030
diff
changeset
|
292 | sized_icon.filename, NULL); |
|
38526dcaa0a7
pidginstock: Look in GtkIconTheme locations for icons
Mike Ruprecht <cmaiku@gmail.com>
parents:
39030
diff
changeset
|
293 | g_free(size_dir); |
|
38526dcaa0a7
pidginstock: Look in GtkIconTheme locations for icons
Mike Ruprecht <cmaiku@gmail.com>
parents:
39030
diff
changeset
|
294 | |
|
38526dcaa0a7
pidginstock: Look in GtkIconTheme locations for icons
Mike Ruprecht <cmaiku@gmail.com>
parents:
39030
diff
changeset
|
295 | file_full = find_file_common(tmp); |
|
38526dcaa0a7
pidginstock: Look in GtkIconTheme locations for icons
Mike Ruprecht <cmaiku@gmail.com>
parents:
39030
diff
changeset
|
296 | g_free(tmp); |
|
38526dcaa0a7
pidginstock: Look in GtkIconTheme locations for icons
Mike Ruprecht <cmaiku@gmail.com>
parents:
39030
diff
changeset
|
297 | } |
|
38526dcaa0a7
pidginstock: Look in GtkIconTheme locations for icons
Mike Ruprecht <cmaiku@gmail.com>
parents:
39030
diff
changeset
|
298 | |
|
24988
4150b857c58b
explicit merge of '33d0b1c4806ab021469a1bccd95f2b753de3bc42'
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
299 | return file_full; |
|
24696
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
300 | } |
|
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
301 | |
|
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
302 | static void |
|
26813
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
303 | add_sized_icon(GtkIconSet *iconset, GtkIconSize sizeid, PidginIconTheme *theme, |
|
29705
3ccbf39a7f8e
Revert some changes to pidginstock.[ch] that are no longer necessary now
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29653
diff
changeset
|
304 | const char *size, SizedStockIcon sized_icon, gboolean translucent) |
|
24696
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
305 | { |
|
16484
4c91c9a40dea
Don't use translucent pixmaps for idle, but apply transparency to icons in pidginstock.c
Sean Egan <seanegan@pidgin.im>
parents:
16454
diff
changeset
|
306 | char *filename; |
|
24696
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
307 | GtkIconSource *source; |
|
16484
4c91c9a40dea
Don't use translucent pixmaps for idle, but apply transparency to icons in pidginstock.c
Sean Egan <seanegan@pidgin.im>
parents:
16454
diff
changeset
|
308 | GdkPixbuf *pixbuf; |
|
4c91c9a40dea
Don't use translucent pixmaps for idle, but apply transparency to icons in pidginstock.c
Sean Egan <seanegan@pidgin.im>
parents:
16454
diff
changeset
|
309 | |
|
23965
13cd30de531b
Add the icon theme files, and re-work some things
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23964
diff
changeset
|
310 | filename = find_icon_file(theme, size, sized_icon, FALSE); |
|
24988
4150b857c58b
explicit merge of '33d0b1c4806ab021469a1bccd95f2b753de3bc42'
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
311 | g_return_if_fail(filename != NULL); |
|
16484
4c91c9a40dea
Don't use translucent pixmaps for idle, but apply transparency to icons in pidginstock.c
Sean Egan <seanegan@pidgin.im>
parents:
16454
diff
changeset
|
312 | pixbuf = gdk_pixbuf_new_from_file(filename, NULL); |
|
24696
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
313 | if (translucent) |
|
29759
89d25a5185e9
Simplify: dest always equals src. No need to copy everything.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29707
diff
changeset
|
314 | do_alphashift(pixbuf); |
|
16484
4c91c9a40dea
Don't use translucent pixmaps for idle, but apply transparency to icons in pidginstock.c
Sean Egan <seanegan@pidgin.im>
parents:
16454
diff
changeset
|
315 | |
|
39030
a2b1c1a2ac86
pidginstock: Silence excessive GtkStock deprecation warnings
Mike Ruprecht <cmaiku@gmail.com>
parents:
38358
diff
changeset
|
316 | G_GNUC_BEGIN_IGNORE_DEPRECATIONS |
|
16484
4c91c9a40dea
Don't use translucent pixmaps for idle, but apply transparency to icons in pidginstock.c
Sean Egan <seanegan@pidgin.im>
parents:
16454
diff
changeset
|
317 | source = gtk_icon_source_new(); |
|
24696
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
318 | gtk_icon_source_set_pixbuf(source, pixbuf); |
|
16484
4c91c9a40dea
Don't use translucent pixmaps for idle, but apply transparency to icons in pidginstock.c
Sean Egan <seanegan@pidgin.im>
parents:
16454
diff
changeset
|
319 | gtk_icon_source_set_direction(source, GTK_TEXT_DIR_LTR); |
|
24988
4150b857c58b
explicit merge of '33d0b1c4806ab021469a1bccd95f2b753de3bc42'
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
320 | gtk_icon_source_set_direction_wildcarded(source, !sized_icon.rtl); |
|
16484
4c91c9a40dea
Don't use translucent pixmaps for idle, but apply transparency to icons in pidginstock.c
Sean Egan <seanegan@pidgin.im>
parents:
16454
diff
changeset
|
321 | gtk_icon_source_set_size(source, sizeid); |
|
29705
3ccbf39a7f8e
Revert some changes to pidginstock.[ch] that are no longer necessary now
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29653
diff
changeset
|
322 | gtk_icon_source_set_size_wildcarded(source, FALSE); |
|
24696
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
323 | gtk_icon_source_set_state_wildcarded(source, TRUE); |
|
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
324 | gtk_icon_set_add_source(iconset, source); |
|
16484
4c91c9a40dea
Don't use translucent pixmaps for idle, but apply transparency to icons in pidginstock.c
Sean Egan <seanegan@pidgin.im>
parents:
16454
diff
changeset
|
325 | gtk_icon_source_free(source); |
|
4c91c9a40dea
Don't use translucent pixmaps for idle, but apply transparency to icons in pidginstock.c
Sean Egan <seanegan@pidgin.im>
parents:
16454
diff
changeset
|
326 | |
|
4c91c9a40dea
Don't use translucent pixmaps for idle, but apply transparency to icons in pidginstock.c
Sean Egan <seanegan@pidgin.im>
parents:
16454
diff
changeset
|
327 | if (sizeid == gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL)) { |
|
4c91c9a40dea
Don't use translucent pixmaps for idle, but apply transparency to icons in pidginstock.c
Sean Egan <seanegan@pidgin.im>
parents:
16454
diff
changeset
|
328 | source = gtk_icon_source_new(); |
|
24696
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
329 | gtk_icon_source_set_pixbuf(source, pixbuf); |
|
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
330 | gtk_icon_source_set_direction_wildcarded(source, TRUE); |
|
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
331 | gtk_icon_source_set_size(source, GTK_ICON_SIZE_MENU); |
|
29705
3ccbf39a7f8e
Revert some changes to pidginstock.[ch] that are no longer necessary now
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29653
diff
changeset
|
332 | gtk_icon_source_set_size_wildcarded(source, FALSE); |
|
24696
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
333 | gtk_icon_source_set_state_wildcarded(source, TRUE); |
|
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
334 | gtk_icon_set_add_source(iconset, source); |
|
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
335 | gtk_icon_source_free(source); |
|
16484
4c91c9a40dea
Don't use translucent pixmaps for idle, but apply transparency to icons in pidginstock.c
Sean Egan <seanegan@pidgin.im>
parents:
16454
diff
changeset
|
336 | } |
|
24696
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
337 | g_free(filename); |
|
16484
4c91c9a40dea
Don't use translucent pixmaps for idle, but apply transparency to icons in pidginstock.c
Sean Egan <seanegan@pidgin.im>
parents:
16454
diff
changeset
|
338 | g_object_unref(pixbuf); |
|
4c91c9a40dea
Don't use translucent pixmaps for idle, but apply transparency to icons in pidginstock.c
Sean Egan <seanegan@pidgin.im>
parents:
16454
diff
changeset
|
339 | |
|
24988
4150b857c58b
explicit merge of '33d0b1c4806ab021469a1bccd95f2b753de3bc42'
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
340 | if (sized_icon.rtl) { |
|
23965
13cd30de531b
Add the icon theme files, and re-work some things
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23964
diff
changeset
|
341 | filename = find_icon_file(theme, size, sized_icon, TRUE); |
|
24988
4150b857c58b
explicit merge of '33d0b1c4806ab021469a1bccd95f2b753de3bc42'
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
342 | g_return_if_fail(filename != NULL); |
|
24696
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
343 | pixbuf = gdk_pixbuf_new_from_file(filename, NULL); |
|
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
344 | if (translucent) |
|
29759
89d25a5185e9
Simplify: dest always equals src. No need to copy everything.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29707
diff
changeset
|
345 | do_alphashift(pixbuf); |
|
23966
af44603a3a6a
fized the icon diplay bug with the icon theme
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23965
diff
changeset
|
346 | |
|
16484
4c91c9a40dea
Don't use translucent pixmaps for idle, but apply transparency to icons in pidginstock.c
Sean Egan <seanegan@pidgin.im>
parents:
16454
diff
changeset
|
347 | source = gtk_icon_source_new(); |
|
24696
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
348 | gtk_icon_source_set_pixbuf(source, pixbuf); |
|
24988
4150b857c58b
explicit merge of '33d0b1c4806ab021469a1bccd95f2b753de3bc42'
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
349 | gtk_icon_source_set_filename(source, filename); |
|
24696
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
350 | gtk_icon_source_set_direction(source, GTK_TEXT_DIR_RTL); |
|
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
351 | gtk_icon_source_set_size(source, sizeid); |
|
29705
3ccbf39a7f8e
Revert some changes to pidginstock.[ch] that are no longer necessary now
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29653
diff
changeset
|
352 | gtk_icon_source_set_size_wildcarded(source, FALSE); |
|
24696
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
353 | gtk_icon_source_set_state_wildcarded(source, TRUE); |
|
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
354 | gtk_icon_set_add_source(iconset, source); |
|
16484
4c91c9a40dea
Don't use translucent pixmaps for idle, but apply transparency to icons in pidginstock.c
Sean Egan <seanegan@pidgin.im>
parents:
16454
diff
changeset
|
355 | g_free(filename); |
|
4c91c9a40dea
Don't use translucent pixmaps for idle, but apply transparency to icons in pidginstock.c
Sean Egan <seanegan@pidgin.im>
parents:
16454
diff
changeset
|
356 | g_object_unref(pixbuf); |
|
4c91c9a40dea
Don't use translucent pixmaps for idle, but apply transparency to icons in pidginstock.c
Sean Egan <seanegan@pidgin.im>
parents:
16454
diff
changeset
|
357 | gtk_icon_source_free(source); |
|
24696
33d0b1c4806a
Try to be more compliant with the freedesktop.org icon spec thingy with
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24594
diff
changeset
|
358 | } |
|
39030
a2b1c1a2ac86
pidginstock: Silence excessive GtkStock deprecation warnings
Mike Ruprecht <cmaiku@gmail.com>
parents:
38358
diff
changeset
|
359 | G_GNUC_END_IGNORE_DEPRECATIONS |
|
16484
4c91c9a40dea
Don't use translucent pixmaps for idle, but apply transparency to icons in pidginstock.c
Sean Egan <seanegan@pidgin.im>
parents:
16454
diff
changeset
|
360 | } |
|
4c91c9a40dea
Don't use translucent pixmaps for idle, but apply transparency to icons in pidginstock.c
Sean Egan <seanegan@pidgin.im>
parents:
16454
diff
changeset
|
361 | |
|
26843
9d7022b30f71
Reload settings after updating icon theme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26813
diff
changeset
|
362 | static void |
|
9d7022b30f71
Reload settings after updating icon theme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26813
diff
changeset
|
363 | reload_settings(void) |
|
9d7022b30f71
Reload settings after updating icon theme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26813
diff
changeset
|
364 | { |
|
35964
3ed06e9d1a86
Fix a gtk3 warning
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35935
diff
changeset
|
365 | gtk_style_context_reset_widgets(gdk_screen_get_default()); |
|
26843
9d7022b30f71
Reload settings after updating icon theme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26813
diff
changeset
|
366 | } |
|
9d7022b30f71
Reload settings after updating icon theme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26813
diff
changeset
|
367 | |
|
23964
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
368 | /***************************************************************************** |
|
25888
d0fdd378a635
Remove trailing whitespace
Mark Doliner <markdoliner@pidgin.im>
parents:
25000
diff
changeset
|
369 | * Public API functions |
|
23964
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
370 | *****************************************************************************/ |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
371 | |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
372 | void |
|
23967
cc5667bc8f1e
Clean up status icon themes a bit
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23966
diff
changeset
|
373 | pidgin_stock_load_status_icon_theme(PidginStatusIconTheme *theme) |
|
23964
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
374 | { |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
375 | GtkIconFactory *icon_factory; |
|
36256
a437550a9308
Remove -Wno-sign-compare and backport fixes from default.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33548
diff
changeset
|
376 | gsize i; |
|
23964
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
377 | GtkIconSet *normal; |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
378 | GtkIconSet *translucent = NULL; |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
379 | GtkWidget *win; |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
380 | |
|
23970
85dcf9218f63
fixes initialize icon theme bug by pre-loading the theme
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23967
diff
changeset
|
381 | if (theme != NULL) { |
|
25888
d0fdd378a635
Remove trailing whitespace
Mark Doliner <markdoliner@pidgin.im>
parents:
25000
diff
changeset
|
382 | purple_prefs_set_string(PIDGIN_PREFS_ROOT "/status/icon-theme", |
|
27262
ce9c568ee33c
A few bits of whitespace changes...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26843
diff
changeset
|
383 | purple_theme_get_name(PURPLE_THEME(theme))); |
|
25888
d0fdd378a635
Remove trailing whitespace
Mark Doliner <markdoliner@pidgin.im>
parents:
25000
diff
changeset
|
384 | purple_prefs_set_path(PIDGIN_PREFS_ROOT "/status/icon-theme-dir", |
|
27262
ce9c568ee33c
A few bits of whitespace changes...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26843
diff
changeset
|
385 | purple_theme_get_dir(PURPLE_THEME(theme))); |
|
23970
85dcf9218f63
fixes initialize icon theme bug by pre-loading the theme
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23967
diff
changeset
|
386 | } |
|
85dcf9218f63
fixes initialize icon theme bug by pre-loading the theme
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23967
diff
changeset
|
387 | else { |
|
85dcf9218f63
fixes initialize icon theme bug by pre-loading the theme
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23967
diff
changeset
|
388 | purple_prefs_set_string(PIDGIN_PREFS_ROOT "/status/icon-theme", ""); |
|
85dcf9218f63
fixes initialize icon theme bug by pre-loading the theme
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23967
diff
changeset
|
389 | purple_prefs_set_path(PIDGIN_PREFS_ROOT "/status/icon-theme-dir", ""); |
|
85dcf9218f63
fixes initialize icon theme bug by pre-loading the theme
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23967
diff
changeset
|
390 | } |
|
25888
d0fdd378a635
Remove trailing whitespace
Mark Doliner <markdoliner@pidgin.im>
parents:
25000
diff
changeset
|
391 | |
|
39030
a2b1c1a2ac86
pidginstock: Silence excessive GtkStock deprecation warnings
Mike Ruprecht <cmaiku@gmail.com>
parents:
38358
diff
changeset
|
392 | G_GNUC_BEGIN_IGNORE_DEPRECATIONS |
|
23964
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
393 | icon_factory = gtk_icon_factory_new(); |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
394 | |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
395 | gtk_icon_factory_add_default(icon_factory); |
|
39030
a2b1c1a2ac86
pidginstock: Silence excessive GtkStock deprecation warnings
Mike Ruprecht <cmaiku@gmail.com>
parents:
38358
diff
changeset
|
396 | G_GNUC_END_IGNORE_DEPRECATIONS |
|
23964
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
397 | |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
398 | win = gtk_window_new(GTK_WINDOW_TOPLEVEL); |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
399 | gtk_widget_realize(win); |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
400 | |
|
39030
a2b1c1a2ac86
pidginstock: Silence excessive GtkStock deprecation warnings
Mike Ruprecht <cmaiku@gmail.com>
parents:
38358
diff
changeset
|
401 | G_GNUC_BEGIN_IGNORE_DEPRECATIONS |
|
23964
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
402 | for (i = 0; i < G_N_ELEMENTS(sized_status_icons); i++) |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
403 | { |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
404 | normal = gtk_icon_set_new(); |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
405 | if (sized_status_icons[i].translucent_name) |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
406 | translucent = gtk_icon_set_new(); |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
407 | |
|
27262
ce9c568ee33c
A few bits of whitespace changes...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26843
diff
changeset
|
408 | #define ADD_SIZED_ICON(name, size) \ |
|
ce9c568ee33c
A few bits of whitespace changes...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26843
diff
changeset
|
409 | if (sized_status_icons[i].name) { \ |
|
29705
3ccbf39a7f8e
Revert some changes to pidginstock.[ch] that are no longer necessary now
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29653
diff
changeset
|
410 | add_sized_icon(normal, name, PIDGIN_ICON_THEME(theme), size, sized_status_icons[i], FALSE); \ |
|
27262
ce9c568ee33c
A few bits of whitespace changes...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26843
diff
changeset
|
411 | if (sized_status_icons[i].translucent_name) \ |
|
29705
3ccbf39a7f8e
Revert some changes to pidginstock.[ch] that are no longer necessary now
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29653
diff
changeset
|
412 | add_sized_icon(translucent, name, PIDGIN_ICON_THEME(theme), size, sized_status_icons[i], TRUE); \ |
|
27262
ce9c568ee33c
A few bits of whitespace changes...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26843
diff
changeset
|
413 | } |
|
23965
13cd30de531b
Add the icon theme files, and re-work some things
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23964
diff
changeset
|
414 | ADD_SIZED_ICON(microscopic, "11"); |
|
13cd30de531b
Add the icon theme files, and re-work some things
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23964
diff
changeset
|
415 | ADD_SIZED_ICON(extra_small, "16"); |
|
13cd30de531b
Add the icon theme files, and re-work some things
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23964
diff
changeset
|
416 | ADD_SIZED_ICON(small, "22"); |
|
13cd30de531b
Add the icon theme files, and re-work some things
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23964
diff
changeset
|
417 | ADD_SIZED_ICON(medium, "32"); |
|
13cd30de531b
Add the icon theme files, and re-work some things
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23964
diff
changeset
|
418 | ADD_SIZED_ICON(large, "48"); |
|
13cd30de531b
Add the icon theme files, and re-work some things
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23964
diff
changeset
|
419 | ADD_SIZED_ICON(huge, "64"); |
|
13cd30de531b
Add the icon theme files, and re-work some things
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23964
diff
changeset
|
420 | #undef ADD_SIZED_ICON |
|
23964
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
421 | |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
422 | gtk_icon_factory_add(icon_factory, sized_status_icons[i].name, normal); |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
423 | gtk_icon_set_unref(normal); |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
424 | |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
425 | if (sized_status_icons[i].translucent_name) { |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
426 | gtk_icon_factory_add(icon_factory, sized_status_icons[i].translucent_name, translucent); |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
427 | gtk_icon_set_unref(translucent); |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
428 | } |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
429 | } |
|
16484
4c91c9a40dea
Don't use translucent pixmaps for idle, but apply transparency to icons in pidginstock.c
Sean Egan <seanegan@pidgin.im>
parents:
16454
diff
changeset
|
430 | |
|
29641
e54552cf87d8
Use GtkStatusIcon on GTK+ 2.10+. That's actually the required version for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29514
diff
changeset
|
431 | for (i = 0; i < G_N_ELEMENTS(sized_tray_icons); i++) |
|
e54552cf87d8
Use GtkStatusIcon on GTK+ 2.10+. That's actually the required version for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29514
diff
changeset
|
432 | { |
|
e54552cf87d8
Use GtkStatusIcon on GTK+ 2.10+. That's actually the required version for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29514
diff
changeset
|
433 | normal = gtk_icon_set_new(); |
|
e54552cf87d8
Use GtkStatusIcon on GTK+ 2.10+. That's actually the required version for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29514
diff
changeset
|
434 | if (sized_tray_icons[i].translucent_name) |
|
e54552cf87d8
Use GtkStatusIcon on GTK+ 2.10+. That's actually the required version for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29514
diff
changeset
|
435 | translucent = gtk_icon_set_new(); |
|
e54552cf87d8
Use GtkStatusIcon on GTK+ 2.10+. That's actually the required version for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29514
diff
changeset
|
436 | |
|
e54552cf87d8
Use GtkStatusIcon on GTK+ 2.10+. That's actually the required version for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29514
diff
changeset
|
437 | #define ADD_SIZED_ICON(name, size) \ |
|
e54552cf87d8
Use GtkStatusIcon on GTK+ 2.10+. That's actually the required version for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29514
diff
changeset
|
438 | if (sized_tray_icons[i].name) { \ |
|
29705
3ccbf39a7f8e
Revert some changes to pidginstock.[ch] that are no longer necessary now
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29653
diff
changeset
|
439 | add_sized_icon(normal, name, PIDGIN_ICON_THEME(theme), size, sized_tray_icons[i], FALSE); \ |
|
29641
e54552cf87d8
Use GtkStatusIcon on GTK+ 2.10+. That's actually the required version for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29514
diff
changeset
|
440 | if (sized_tray_icons[i].translucent_name) \ |
|
29705
3ccbf39a7f8e
Revert some changes to pidginstock.[ch] that are no longer necessary now
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29653
diff
changeset
|
441 | add_sized_icon(translucent, name, PIDGIN_ICON_THEME(theme), size, sized_tray_icons[i], TRUE); \ |
|
29641
e54552cf87d8
Use GtkStatusIcon on GTK+ 2.10+. That's actually the required version for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29514
diff
changeset
|
442 | } |
|
39045
ad2b0e960d3c
Move tray icons to status directory of the icon theme specification
Mike Ruprecht <cmaiku@gmail.com>
parents:
39041
diff
changeset
|
443 | ADD_SIZED_ICON(extra_small, "16"); |
|
ad2b0e960d3c
Move tray icons to status directory of the icon theme specification
Mike Ruprecht <cmaiku@gmail.com>
parents:
39041
diff
changeset
|
444 | ADD_SIZED_ICON(small, "22"); |
|
ad2b0e960d3c
Move tray icons to status directory of the icon theme specification
Mike Ruprecht <cmaiku@gmail.com>
parents:
39041
diff
changeset
|
445 | ADD_SIZED_ICON(medium, "32"); |
|
ad2b0e960d3c
Move tray icons to status directory of the icon theme specification
Mike Ruprecht <cmaiku@gmail.com>
parents:
39041
diff
changeset
|
446 | ADD_SIZED_ICON(large, "48"); |
|
29641
e54552cf87d8
Use GtkStatusIcon on GTK+ 2.10+. That's actually the required version for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29514
diff
changeset
|
447 | #undef ADD_SIZED_ICON |
|
e54552cf87d8
Use GtkStatusIcon on GTK+ 2.10+. That's actually the required version for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29514
diff
changeset
|
448 | |
|
e54552cf87d8
Use GtkStatusIcon on GTK+ 2.10+. That's actually the required version for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29514
diff
changeset
|
449 | gtk_icon_factory_add(icon_factory, sized_tray_icons[i].name, normal); |
|
e54552cf87d8
Use GtkStatusIcon on GTK+ 2.10+. That's actually the required version for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29514
diff
changeset
|
450 | gtk_icon_set_unref(normal); |
|
e54552cf87d8
Use GtkStatusIcon on GTK+ 2.10+. That's actually the required version for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29514
diff
changeset
|
451 | |
|
e54552cf87d8
Use GtkStatusIcon on GTK+ 2.10+. That's actually the required version for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29514
diff
changeset
|
452 | if (sized_tray_icons[i].translucent_name) { |
|
e54552cf87d8
Use GtkStatusIcon on GTK+ 2.10+. That's actually the required version for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29514
diff
changeset
|
453 | gtk_icon_factory_add(icon_factory, sized_tray_icons[i].translucent_name, translucent); |
|
e54552cf87d8
Use GtkStatusIcon on GTK+ 2.10+. That's actually the required version for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29514
diff
changeset
|
454 | gtk_icon_set_unref(translucent); |
|
e54552cf87d8
Use GtkStatusIcon on GTK+ 2.10+. That's actually the required version for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29514
diff
changeset
|
455 | } |
|
e54552cf87d8
Use GtkStatusIcon on GTK+ 2.10+. That's actually the required version for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29514
diff
changeset
|
456 | } |
|
39030
a2b1c1a2ac86
pidginstock: Silence excessive GtkStock deprecation warnings
Mike Ruprecht <cmaiku@gmail.com>
parents:
38358
diff
changeset
|
457 | G_GNUC_END_IGNORE_DEPRECATIONS |
|
29641
e54552cf87d8
Use GtkStatusIcon on GTK+ 2.10+. That's actually the required version for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29514
diff
changeset
|
458 | |
|
23964
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
459 | gtk_widget_destroy(win); |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
460 | g_object_unref(G_OBJECT(icon_factory)); |
|
26843
9d7022b30f71
Reload settings after updating icon theme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26813
diff
changeset
|
461 | reload_settings(); |
|
16484
4c91c9a40dea
Don't use translucent pixmaps for idle, but apply transparency to icons in pidginstock.c
Sean Egan <seanegan@pidgin.im>
parents:
16454
diff
changeset
|
462 | } |
|
4c91c9a40dea
Don't use translucent pixmaps for idle, but apply transparency to icons in pidginstock.c
Sean Egan <seanegan@pidgin.im>
parents:
16454
diff
changeset
|
463 | |
| 10297 | 464 | void |
|
26813
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
465 | pidgin_stock_load_stock_icon_theme(PidginStockIconTheme *theme) |
| 10297 | 466 | { |
| 467 | GtkIconFactory *icon_factory; | |
|
36256
a437550a9308
Remove -Wno-sign-compare and backport fixes from default.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33548
diff
changeset
|
468 | gsize i; |
| 10297 | 469 | GtkWidget *win; |
| 470 | ||
|
26813
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
471 | if (theme != NULL) { |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
472 | purple_prefs_set_string(PIDGIN_PREFS_ROOT "/stock/icon-theme", |
|
27262
ce9c568ee33c
A few bits of whitespace changes...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26843
diff
changeset
|
473 | purple_theme_get_name(PURPLE_THEME(theme))); |
|
26813
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
474 | purple_prefs_set_path(PIDGIN_PREFS_ROOT "/stock/icon-theme-dir", |
|
27262
ce9c568ee33c
A few bits of whitespace changes...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26843
diff
changeset
|
475 | purple_theme_get_dir(PURPLE_THEME(theme))); |
|
26813
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
476 | } |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
477 | else { |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
478 | purple_prefs_set_string(PIDGIN_PREFS_ROOT "/stock/icon-theme", ""); |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
479 | purple_prefs_set_path(PIDGIN_PREFS_ROOT "/stock/icon-theme-dir", ""); |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
480 | } |
| 10297 | 481 | |
|
39030
a2b1c1a2ac86
pidginstock: Silence excessive GtkStock deprecation warnings
Mike Ruprecht <cmaiku@gmail.com>
parents:
38358
diff
changeset
|
482 | G_GNUC_BEGIN_IGNORE_DEPRECATIONS |
| 10297 | 483 | icon_factory = gtk_icon_factory_new(); |
| 484 | ||
| 485 | gtk_icon_factory_add_default(icon_factory); | |
|
39030
a2b1c1a2ac86
pidginstock: Silence excessive GtkStock deprecation warnings
Mike Ruprecht <cmaiku@gmail.com>
parents:
38358
diff
changeset
|
486 | G_GNUC_END_IGNORE_DEPRECATIONS |
| 10297 | 487 | |
| 488 | win = gtk_window_new(GTK_WINDOW_TOPLEVEL); | |
| 489 | gtk_widget_realize(win); | |
| 490 | ||
|
39030
a2b1c1a2ac86
pidginstock: Silence excessive GtkStock deprecation warnings
Mike Ruprecht <cmaiku@gmail.com>
parents:
38358
diff
changeset
|
491 | G_GNUC_BEGIN_IGNORE_DEPRECATIONS |
|
23965
13cd30de531b
Add the icon theme files, and re-work some things
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23964
diff
changeset
|
492 | /* All non-sized icons */ |
|
26813
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
493 | for (i = 0; i < G_N_ELEMENTS(stock_icons); i++) { |
|
15458
39c79dc7c965
A lot of status icon changes:
Sean Egan <seanegan@pidgin.im>
parents:
15435
diff
changeset
|
494 | GtkIconSource *source; |
| 10297 | 495 | GtkIconSet *iconset; |
| 496 | gchar *filename; | |
| 497 | ||
|
26813
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
498 | if (stock_icons[i].dir == NULL) { |
|
41087
4fc5b0ddf55e
Remove the + from GTK
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
41034
diff
changeset
|
499 | /* GTK Stock icon */ |
|
33271
53bf180b9eb1
Use GtkStyleContext instead of GtkStyle on GTK+3.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33133
diff
changeset
|
500 | iconset = gtk_style_context_lookup_icon_set(gtk_widget_get_style_context(win), |
|
53bf180b9eb1
Use GtkStyleContext instead of GtkStyle on GTK+3.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33133
diff
changeset
|
501 | stock_icons[i].filename); |
|
26813
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
502 | } else { |
| 10297 | 503 | filename = find_file(stock_icons[i].dir, stock_icons[i].filename); |
| 504 | ||
| 505 | if (filename == NULL) | |
| 506 | continue; | |
| 507 | ||
|
15458
39c79dc7c965
A lot of status icon changes:
Sean Egan <seanegan@pidgin.im>
parents:
15435
diff
changeset
|
508 | source = gtk_icon_source_new(); |
|
39c79dc7c965
A lot of status icon changes:
Sean Egan <seanegan@pidgin.im>
parents:
15435
diff
changeset
|
509 | gtk_icon_source_set_filename(source, filename); |
|
39c79dc7c965
A lot of status icon changes:
Sean Egan <seanegan@pidgin.im>
parents:
15435
diff
changeset
|
510 | gtk_icon_source_set_direction_wildcarded(source, TRUE); |
|
39c79dc7c965
A lot of status icon changes:
Sean Egan <seanegan@pidgin.im>
parents:
15435
diff
changeset
|
511 | gtk_icon_source_set_size_wildcarded(source, TRUE); |
|
39c79dc7c965
A lot of status icon changes:
Sean Egan <seanegan@pidgin.im>
parents:
15435
diff
changeset
|
512 | gtk_icon_source_set_state_wildcarded(source, TRUE); |
|
21811
c07bdd3bd67a
I find this less painful to the eyes.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
20834
diff
changeset
|
513 | |
|
15458
39c79dc7c965
A lot of status icon changes:
Sean Egan <seanegan@pidgin.im>
parents:
15435
diff
changeset
|
514 | iconset = gtk_icon_set_new(); |
|
39c79dc7c965
A lot of status icon changes:
Sean Egan <seanegan@pidgin.im>
parents:
15435
diff
changeset
|
515 | gtk_icon_set_add_source(iconset, source); |
|
21811
c07bdd3bd67a
I find this less painful to the eyes.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
20834
diff
changeset
|
516 | |
|
15458
39c79dc7c965
A lot of status icon changes:
Sean Egan <seanegan@pidgin.im>
parents:
15435
diff
changeset
|
517 | gtk_icon_source_free(source); |
|
39c79dc7c965
A lot of status icon changes:
Sean Egan <seanegan@pidgin.im>
parents:
15435
diff
changeset
|
518 | g_free(filename); |
| 10297 | 519 | } |
| 520 | ||
| 521 | gtk_icon_factory_add(icon_factory, stock_icons[i].name, iconset); | |
| 522 | ||
| 523 | gtk_icon_set_unref(iconset); | |
| 524 | } | |
| 525 | ||
|
23965
13cd30de531b
Add the icon theme files, and re-work some things
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23964
diff
changeset
|
526 | /* All non-status sized icons */ |
|
15458
39c79dc7c965
A lot of status icon changes:
Sean Egan <seanegan@pidgin.im>
parents:
15435
diff
changeset
|
527 | for (i = 0; i < G_N_ELEMENTS(sized_stock_icons); i++) |
|
39c79dc7c965
A lot of status icon changes:
Sean Egan <seanegan@pidgin.im>
parents:
15435
diff
changeset
|
528 | { |
|
23965
13cd30de531b
Add the icon theme files, and re-work some things
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23964
diff
changeset
|
529 | GtkIconSet *iconset = gtk_icon_set_new(); |
|
21811
c07bdd3bd67a
I find this less painful to the eyes.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
20834
diff
changeset
|
530 | |
|
27262
ce9c568ee33c
A few bits of whitespace changes...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26843
diff
changeset
|
531 | #define ADD_SIZED_ICON(name, size) \ |
|
ce9c568ee33c
A few bits of whitespace changes...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26843
diff
changeset
|
532 | if (sized_stock_icons[i].name) \ |
|
29705
3ccbf39a7f8e
Revert some changes to pidginstock.[ch] that are no longer necessary now
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29653
diff
changeset
|
533 | add_sized_icon(iconset, name, PIDGIN_ICON_THEME(theme), size, sized_stock_icons[i], FALSE); |
|
21811
c07bdd3bd67a
I find this less painful to the eyes.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
20834
diff
changeset
|
534 | ADD_SIZED_ICON(microscopic, "11"); |
|
c07bdd3bd67a
I find this less painful to the eyes.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
20834
diff
changeset
|
535 | ADD_SIZED_ICON(extra_small, "16"); |
|
c07bdd3bd67a
I find this less painful to the eyes.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
20834
diff
changeset
|
536 | ADD_SIZED_ICON(small, "22"); |
|
c07bdd3bd67a
I find this less painful to the eyes.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
20834
diff
changeset
|
537 | ADD_SIZED_ICON(medium, "32"); |
|
c07bdd3bd67a
I find this less painful to the eyes.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
20834
diff
changeset
|
538 | ADD_SIZED_ICON(large, "48"); |
|
c07bdd3bd67a
I find this less painful to the eyes.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
20834
diff
changeset
|
539 | ADD_SIZED_ICON(huge, "64"); |
|
c07bdd3bd67a
I find this less painful to the eyes.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
20834
diff
changeset
|
540 | #undef ADD_SIZED_ICON |
|
15458
39c79dc7c965
A lot of status icon changes:
Sean Egan <seanegan@pidgin.im>
parents:
15435
diff
changeset
|
541 | |
|
39c79dc7c965
A lot of status icon changes:
Sean Egan <seanegan@pidgin.im>
parents:
15435
diff
changeset
|
542 | gtk_icon_factory_add(icon_factory, sized_stock_icons[i].name, iconset); |
|
39c79dc7c965
A lot of status icon changes:
Sean Egan <seanegan@pidgin.im>
parents:
15435
diff
changeset
|
543 | gtk_icon_set_unref(iconset); |
|
39c79dc7c965
A lot of status icon changes:
Sean Egan <seanegan@pidgin.im>
parents:
15435
diff
changeset
|
544 | } |
|
39030
a2b1c1a2ac86
pidginstock: Silence excessive GtkStock deprecation warnings
Mike Ruprecht <cmaiku@gmail.com>
parents:
38358
diff
changeset
|
545 | G_GNUC_END_IGNORE_DEPRECATIONS |
|
15458
39c79dc7c965
A lot of status icon changes:
Sean Egan <seanegan@pidgin.im>
parents:
15435
diff
changeset
|
546 | |
|
39c79dc7c965
A lot of status icon changes:
Sean Egan <seanegan@pidgin.im>
parents:
15435
diff
changeset
|
547 | gtk_widget_destroy(win); |
| 10297 | 548 | g_object_unref(G_OBJECT(icon_factory)); |
|
26843
9d7022b30f71
Reload settings after updating icon theme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26813
diff
changeset
|
549 | reload_settings(); |
|
26813
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
550 | } |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
551 | |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
552 | void |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
553 | pidgin_stock_init(void) |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
554 | { |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
555 | PidginIconThemeLoader *loader, *stockloader; |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
556 | const gchar *path = NULL; |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
557 | |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
558 | if (stock_initted) |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
559 | return; |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
560 | |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
561 | stock_initted = TRUE; |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
562 | |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
563 | /* Setup the status icon theme */ |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
564 | loader = g_object_new(PIDGIN_TYPE_ICON_THEME_LOADER, "type", "status-icon", NULL); |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
565 | purple_theme_manager_register_type(PURPLE_THEME_LOADER(loader)); |
|
28476
04e8f641aa37
Call purple_prefs_add_none on the parents for the status and stock icon
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28449
diff
changeset
|
566 | purple_prefs_add_none(PIDGIN_PREFS_ROOT "/status"); |
|
26813
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
567 | purple_prefs_add_string(PIDGIN_PREFS_ROOT "/status/icon-theme", ""); |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
568 | purple_prefs_add_path(PIDGIN_PREFS_ROOT "/status/icon-theme-dir", ""); |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
569 | |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
570 | stockloader = g_object_new(PIDGIN_TYPE_ICON_THEME_LOADER, "type", "stock-icon", NULL); |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
571 | purple_theme_manager_register_type(PURPLE_THEME_LOADER(stockloader)); |
|
28476
04e8f641aa37
Call purple_prefs_add_none on the parents for the status and stock icon
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28449
diff
changeset
|
572 | purple_prefs_add_none(PIDGIN_PREFS_ROOT "/stock"); |
|
26813
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
573 | purple_prefs_add_string(PIDGIN_PREFS_ROOT "/stock/icon-theme", ""); |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
574 | purple_prefs_add_path(PIDGIN_PREFS_ROOT "/stock/icon-theme-dir", ""); |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
575 | |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
576 | /* register custom icon sizes */ |
|
39030
a2b1c1a2ac86
pidginstock: Silence excessive GtkStock deprecation warnings
Mike Ruprecht <cmaiku@gmail.com>
parents:
38358
diff
changeset
|
577 | G_GNUC_BEGIN_IGNORE_DEPRECATIONS |
|
26813
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
578 | microscopic = gtk_icon_size_register(PIDGIN_ICON_SIZE_TANGO_MICROSCOPIC, 11, 11); |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
579 | extra_small = gtk_icon_size_register(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL, 16, 16); |
|
27262
ce9c568ee33c
A few bits of whitespace changes...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26843
diff
changeset
|
580 | small = gtk_icon_size_register(PIDGIN_ICON_SIZE_TANGO_SMALL, 22, 22); |
|
ce9c568ee33c
A few bits of whitespace changes...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26843
diff
changeset
|
581 | medium = gtk_icon_size_register(PIDGIN_ICON_SIZE_TANGO_MEDIUM, 32, 32); |
|
ce9c568ee33c
A few bits of whitespace changes...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26843
diff
changeset
|
582 | large = gtk_icon_size_register(PIDGIN_ICON_SIZE_TANGO_LARGE, 48, 48); |
|
ce9c568ee33c
A few bits of whitespace changes...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26843
diff
changeset
|
583 | huge = gtk_icon_size_register(PIDGIN_ICON_SIZE_TANGO_HUGE, 64, 64); |
|
39030
a2b1c1a2ac86
pidginstock: Silence excessive GtkStock deprecation warnings
Mike Ruprecht <cmaiku@gmail.com>
parents:
38358
diff
changeset
|
584 | G_GNUC_END_IGNORE_DEPRECATIONS |
|
26813
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
585 | |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
586 | pidgin_stock_load_stock_icon_theme(NULL); |
| 10297 | 587 | |
|
23973
189295d2ee8e
clean up formatting, and added render settings for the names/markup on the blist
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23972
diff
changeset
|
588 | /* Pre-load Status icon theme - this avoids a bug with displaying the correct icon in the tray, theme is destroyed after*/ |
|
28449
69dd8af58b41
I guess this pref name was changed but this one line was not. This would
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27910
diff
changeset
|
589 | if (purple_prefs_get_string(PIDGIN_PREFS_ROOT "/status/icon-theme") && |
|
23970
85dcf9218f63
fixes initialize icon theme bug by pre-loading the theme
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23967
diff
changeset
|
590 | (path = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/status/icon-theme-dir"))) { |
|
25888
d0fdd378a635
Remove trailing whitespace
Mark Doliner <markdoliner@pidgin.im>
parents:
25000
diff
changeset
|
591 | |
|
23972
90e0da03c053
theme loader cleanup, and remove a few warnings
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23970
diff
changeset
|
592 | PidginStatusIconTheme *theme = PIDGIN_STATUS_ICON_THEME(purple_theme_loader_build(PURPLE_THEME_LOADER(loader), path)); |
|
23970
85dcf9218f63
fixes initialize icon theme bug by pre-loading the theme
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23967
diff
changeset
|
593 | pidgin_stock_load_status_icon_theme(theme); |
|
28515
10d8aab24f2e
Fix minor assert so I can run with G_DEBUG=fatal_criticals.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28476
diff
changeset
|
594 | if (theme) |
|
10d8aab24f2e
Fix minor assert so I can run with G_DEBUG=fatal_criticals.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28476
diff
changeset
|
595 | g_object_unref(G_OBJECT(theme)); |
|
23970
85dcf9218f63
fixes initialize icon theme bug by pre-loading the theme
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23967
diff
changeset
|
596 | |
|
27262
ce9c568ee33c
A few bits of whitespace changes...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26843
diff
changeset
|
597 | } |
|
ce9c568ee33c
A few bits of whitespace changes...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26843
diff
changeset
|
598 | else |
|
ce9c568ee33c
A few bits of whitespace changes...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26843
diff
changeset
|
599 | pidgin_stock_load_status_icon_theme(NULL); |
|
23964
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23423
diff
changeset
|
600 | |
| 10297 | 601 | /* Register the stock items. */ |
|
39030
a2b1c1a2ac86
pidginstock: Silence excessive GtkStock deprecation warnings
Mike Ruprecht <cmaiku@gmail.com>
parents:
38358
diff
changeset
|
602 | G_GNUC_BEGIN_IGNORE_DEPRECATIONS |
| 10297 | 603 | gtk_stock_add_static(stock_items, G_N_ELEMENTS(stock_items)); |
|
39030
a2b1c1a2ac86
pidginstock: Silence excessive GtkStock deprecation warnings
Mike Ruprecht <cmaiku@gmail.com>
parents:
38358
diff
changeset
|
604 | G_GNUC_END_IGNORE_DEPRECATIONS |
| 10297 | 605 | } |
|
26813
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
606 | |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
607 | static void |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
608 | pidgin_stock_icon_theme_class_init(PidginStockIconThemeClass *klass) |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
609 | { |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
610 | } |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
611 | |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
612 | GType |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
613 | pidgin_stock_icon_theme_get_type(void) |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
614 | { |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
615 | static GType type = 0; |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
616 | if (type == 0) { |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
617 | static const GTypeInfo info = { |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
618 | sizeof (PidginStockIconThemeClass), |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
619 | NULL, /* base_init */ |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
620 | NULL, /* base_finalize */ |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
621 | (GClassInitFunc)pidgin_stock_icon_theme_class_init, /* class_init */ |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
622 | NULL, /* class_finalize */ |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
623 | NULL, /* class_data */ |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
624 | sizeof (PidginStockIconTheme), |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
625 | 0, /* n_preallocs */ |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
626 | NULL, |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
627 | NULL, /* value table */ |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
628 | }; |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
629 | type = g_type_register_static(PIDGIN_TYPE_ICON_THEME, |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
630 | "PidginStockIconTheme", &info, 0); |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
631 | } |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
632 | return type; |
|
c1a058a2466e
Make it possible to load non-status icons using a PidginStockIconTheme.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26747
diff
changeset
|
633 | } |