1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
|
Index: configure.ac
===================================================================
--- configure.ac (revision 2098)
+++ configure.ac (working copy)
@@ -88,14 +88,12 @@
applets/launcher/Makefile
applets/notify/Makefile
applets/startup/Makefile
-applets/startup/data/Makefile
applets/startup-notify/Makefile
applets/systray/Makefile
applets/showdesktop/Makefile
applets/windowselector/Makefile
applets/battery/Makefile
applets/brightness/Makefile
-applets/brightness/data/Makefile
po/Makefile.in
po/Makefile
])
Index: applets/startup/startup.c
===================================================================
--- applets/startup/startup.c (revision 2098)
+++ applets/startup/startup.c (working copy)
@@ -191,8 +191,8 @@
if (applet->hourglass_cur_frame_n == 8)
applet->hourglass_cur_frame_n = 0;
- icon = malloc (sizeof(DATADIR) + 16);
- sprintf (icon, "%s/hourglass-%i.png", DATADIR,
+ icon = malloc (12);
+ sprintf (icon, "hourglass-%i",
applet->hourglass_cur_frame_n);
mb_panel_scaling_image_set_icon (applet->image, icon);
Index: applets/startup/Makefile.am
===================================================================
--- applets/startup/Makefile.am (revision 2098)
+++ applets/startup/Makefile.am (working copy)
@@ -1,5 +1,3 @@
-SUBDIRS = data
-
AM_CPPFLAGS=-DPKGDATADIR=\"$(pkgdatadir)\" \
-DGETTEXT_PACKAGE=\"matchbox-panel\" \
-DDATADIR=\"$(pkgdatadir)/startup/\"
Index: applets/brightness/Makefile.am
===================================================================
--- applets/brightness/Makefile.am (revision 2098)
+++ applets/brightness/Makefile.am (working copy)
@@ -1,5 +1,3 @@
-SUBDIRS = data
-
AM_CPPFLAGS=-DPKGDATADIR=\"$(pkgdatadir)\" \
-DGETTEXT_PACKAGE=\"matchbox-panel\" \
-DDATADIR=\"$(pkgdatadir)/brightness/\"
Index: applets/brightness/brightness.c
===================================================================
--- applets/brightness/brightness.c (revision 2098)
+++ applets/brightness/brightness.c (working copy)
@@ -131,7 +131,6 @@
NULL};
theme = gtk_icon_theme_get_default();
- gtk_icon_theme_append_search_path(theme, DATADIR);
applet = g_slice_new(BrightnessApplet);
scale = gtk_scale_button_new(GTK_ICON_SIZE_BUTTON,
Index: applets/windowselector/windowselector.c
===================================================================
--- applets/windowselector/windowselector.c (revision 2098)
+++ applets/windowselector/windowselector.c (working copy)
@@ -797,7 +797,7 @@
switch (applet->mode) {
case MODE_STATIC_ICON:
applet->image = mb_panel_scaling_image_new (orientation,
- "panel-task-switcher");
+ "task-switcher");
gtk_container_add (GTK_CONTAINER (applet->button),
applet->image);
break;
Index: applets/showdesktop/showdesktop.c
===================================================================
--- applets/showdesktop/showdesktop.c (revision 2098)
+++ applets/showdesktop/showdesktop.c (working copy)
@@ -50,7 +50,7 @@
/* TODO: remove this function and instead use a toggle button? */
- icon = "panel-user-desktop";
+ icon = "user-desktop";
mb_panel_scaling_image_set_icon (applet->image, icon);
}
|
