diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | data/Makefile.am | 7 | ||||
| -rw-r--r-- | data/background.png | bin | 0 -> 19869 bytes | |||
| -rw-r--r-- | data/data.h.in | 1 | ||||
| -rw-r--r-- | src/dock.png | bin | 15852 -> 0 bytes | |||
| -rw-r--r-- | src/sbmanager.c | 8 |
8 files changed, 17 insertions, 4 deletions
@@ -31,3 +31,4 @@ libtool stamp-h1 src/.libs src/sbmanager +data/data.h diff --git a/Makefile.am b/Makefile.am index 4c3e7c3..9166b4a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = src +SUBDIRS = src data diff --git a/configure.ac b/configure.ac index f90dd41..52da2ca 100644 --- a/configure.ac +++ b/configure.ac @@ -49,5 +49,7 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) AC_OUTPUT([ Makefile src/Makefile +data/data.h +data/Makefile ]) diff --git a/data/Makefile.am b/data/Makefile.am new file mode 100644 index 0000000..fe8325a --- /dev/null +++ b/data/Makefile.am @@ -0,0 +1,7 @@ +pixmapdir = $(pkgdatadir) + +PIX = background.png + +pixmap_DATA = $(PIX) + +EXTRA_DIST = $(pixmap_DATA) diff --git a/data/background.png b/data/background.png Binary files differnew file mode 100644 index 0000000..7077fa1 --- /dev/null +++ b/data/background.png diff --git a/data/data.h.in b/data/data.h.in new file mode 100644 index 0000000..3c7e521 --- /dev/null +++ b/data/data.h.in @@ -0,0 +1 @@ +#define BGPIC "@prefix@/share/sbmanager/background.png" diff --git a/src/dock.png b/src/dock.png Binary files differdeleted file mode 100644 index 9e4d49c..0000000 --- a/src/dock.png +++ /dev/null diff --git a/src/sbmanager.c b/src/sbmanager.c index ad17a92..5ca4637 100644 --- a/src/sbmanager.c +++ b/src/sbmanager.c @@ -32,6 +32,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include <clutter-gtk/clutter-gtk.h> #include <gdk-pixbuf/gdk-pixbuf.h> +#include "../data/data.h" + #define ITEM_FONT "Sans Bold 7" typedef struct { @@ -509,16 +511,16 @@ int main(int argc, char **argv) /* dock background */ GError *err = NULL; - actor = clutter_texture_new_from_file("./dock.png", &err); + actor = clutter_texture_new_from_file(BGPIC, &err); if (err) { g_error_free(err); } if (actor) { - clutter_actor_set_position(actor, 0, clutter_actor_get_height(stage) - clutter_actor_get_height(actor)); + clutter_actor_set_position(actor, 0, 0); clutter_actor_show(actor); clutter_group_add (CLUTTER_GROUP(stage), actor); } else { - fprintf(stderr, "could not load dock.png\n"); + fprintf(stderr, "could not load background.png\n"); } /* clock widget */ |
