diff options
| author | Perberos <[email protected]> | 2011-11-15 18:23:47 -0300 |
|---|---|---|
| committer | Perberos <[email protected]> | 2011-11-15 18:23:47 -0300 |
| commit | ae2b93a6f78a987062a96a34907be3b343436577 (patch) | |
| tree | c7b16153e64f42f39828f71131d2c7228d717daf /stickynotes | |
| parent | 01f6cac0620849cb01605e90c4d842f620a9c290 (diff) | |
| download | mate-applets-ae2b93a6f78a987062a96a34907be3b343436577.tar.bz2 mate-applets-ae2b93a6f78a987062a96a34907be3b343436577.tar.xz | |
fixing file conflicts on stickynotes applet
Diffstat (limited to 'stickynotes')
| -rw-r--r-- | stickynotes/Makefile.am | 2 | ||||
| -rw-r--r-- | stickynotes/pixmaps/Makefile.am | 2 | ||||
| -rw-r--r-- | stickynotes/stickynotes_applet.c | 13 |
3 files changed, 8 insertions, 9 deletions
diff --git a/stickynotes/Makefile.am b/stickynotes/Makefile.am index 2f1e8fef..9a0fa9c0 100644 --- a/stickynotes/Makefile.am +++ b/stickynotes/Makefile.am @@ -16,7 +16,7 @@ INCLUDES = \ $(LIBWNCK_CFLAGS) \ $(XML2_CFLAGS) \ -DSTICKYNOTES_MENU_UI_DIR=\""$(uidir)"\"\ - -DSTICKYNOTES_ICONDIR=\"$(datadir)/pixmaps/stickynotes/\" + -DSTICKYNOTES_ICONDIR=\"$(datadir)/pixmaps/mate-stickynotes/\" libexec_PROGRAMS = stickynotes_applet diff --git a/stickynotes/pixmaps/Makefile.am b/stickynotes/pixmaps/Makefile.am index 95634b58..837ecbb8 100644 --- a/stickynotes/pixmaps/Makefile.am +++ b/stickynotes/pixmaps/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -stickynotes_applet_pixmapsdir = $(datadir)/pixmaps/stickynotes +stickynotes_applet_pixmapsdir = $(datadir)/pixmaps/mate-stickynotes stickynotes_applet_pixmaps_DATA = \ locked.png \ unlocked.png \ diff --git a/stickynotes/stickynotes_applet.c b/stickynotes/stickynotes_applet.c index fc3bce71..59d8210a 100644 --- a/stickynotes/stickynotes_applet.c +++ b/stickynotes/stickynotes_applet.c @@ -58,13 +58,12 @@ static const GtkToggleActionEntry stickynotes_applet_menu_toggle_actions[] = }; /* Sticky Notes Icons */ -static const StickyNotesStockIcon stickynotes_icons[] = -{ - { STICKYNOTES_STOCK_LOCKED, STICKYNOTES_ICONDIR "/locked.png" }, - { STICKYNOTES_STOCK_UNLOCKED, STICKYNOTES_ICONDIR "/unlocked.png" }, - { STICKYNOTES_STOCK_CLOSE, STICKYNOTES_ICONDIR "/close.png" }, - { STICKYNOTES_STOCK_RESIZE_SE, STICKYNOTES_ICONDIR "/resize_se.png" }, - { STICKYNOTES_STOCK_RESIZE_SW, STICKYNOTES_ICONDIR "/resize_sw.png" } +static const StickyNotesStockIcon stickynotes_icons[] = { + {STICKYNOTES_STOCK_LOCKED, STICKYNOTES_ICONDIR "/locked.png"}, + {STICKYNOTES_STOCK_UNLOCKED, STICKYNOTES_ICONDIR "/unlocked.png"}, + {STICKYNOTES_STOCK_CLOSE, STICKYNOTES_ICONDIR "/close.png"}, + {STICKYNOTES_STOCK_RESIZE_SE, STICKYNOTES_ICONDIR "/resize_se.png"}, + {STICKYNOTES_STOCK_RESIZE_SW, STICKYNOTES_ICONDIR "/resize_sw.png"} }; /* Sticky Notes applet factory */ |