1 --- marquee-plugins-0.22/debian/rules
2 +++ marquee-plugins-0.22/debian/rules
6 +include /usr/share/cdbs/1/rules/simple-patchsys.mk
8 +CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
10 +configure: configure-stamp
14 + CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --sysconf=/etc
17 +build: apply-patches build-stamp
18 +build-stamp: configure-stamp
26 + rm -f build-stamp configure-stamp
27 + [ ! -f Makefile ] || $(MAKE) distclean
35 + $(MAKE) DESTDIR=$(CURDIR)/debian/marquee-plugins install
36 + install -D -m 644 $(CURDIR)/src/clock-plugin.conf $(CURDIR)/debian/marquee-plugins/etc/clock-plugin.conf
38 +binary-indep: build install
40 +binary-arch: build install
43 + dh_installchangelogs -s ChangeLog
45 + dh_installexamples -s
57 +binary: binary-indep binary-arch
58 +.PHONY: build clean binary-indep binary-arch binary install configure
59 --- marquee-plugins-0.22/debian/compat
60 +++ marquee-plugins-0.22/debian/compat
63 --- marquee-plugins-0.22/debian/marquee-plugins.postinst
64 +++ marquee-plugins-0.22/debian/marquee-plugins.postinst
70 +# disabled for Ubuntu; we should fix the config file instead
73 +# if [ -w "/etc/hildon-desktop/desktop.conf" ]; then
74 +# sed -i 's/549/670/;s/200/303/' /etc/hildon-desktop/desktop.conf
77 +# if [ -w "/etc/hildon-desktop/marquee.conf" ]; then
78 +# sed -i 's/navigator/marquee/;s/applications-menu/showhome-plugin/' /etc/hildon-d
86 --- marquee-plugins-0.22/debian/marquee-plugins1.dirs
87 +++ marquee-plugins-0.22/debian/marquee-plugins1.dirs
89 +usr/lib/hildon-desktop
91 +usr/share/applications/hildon-marquee
92 +usr/share/applications/hildon-status-bar
93 --- marquee-plugins-0.22/debian/control
94 +++ marquee-plugins-0.22/debian/control
96 +Source: marquee-plugins
99 +Maintainer: Ubuntu Mobile <ubuntu-mobile@lists.ubuntu.com>
100 +XSBC-Original-Maintainer: Bob Spencer <bob.spencer@intel.com>
101 +Build-Depends: debhelper (>= 5),
103 + automake (>= 1:1.10),
104 + automake (<< 1:1.11~),
106 + libhildondesktop-dev,
107 + libdbus-glib-1-dev,
110 +Standards-Version: 3.7.3
112 +Package: marquee-plugins
115 +Depends: hildon-desktop,
118 +Description: Plugins for the Hildon marquee
119 + This package contains the marquee plugins for hildon, such as the
120 + application menu, the clock and the close button.
121 --- marquee-plugins-0.22/debian/copyright
122 +++ marquee-plugins-0.22/debian/copyright
124 +This package was debianized by bspencer <bob.spencer@intel.com> on
125 +Mon, 02 Jul 2007 16:39:31 +0000.
127 +It was downloaded from <http://moblin.org/repos/releases/>.
130 + Lucas Rocha <lucas.rocha@nokia.com>
131 + Bob Spencer <bob.spencer@intel.com>
132 + Horace Li <horace.li@intel.com>
133 + Bo Xu <bo.b.xu@intel.com>
137 + Copyright (C) 2007 Intel Corporation.
138 + Copyright (C) 2006 Nokia Corporation.
142 +This library is free software; you can redistribute it and/or
143 +modify it under the terms of the GNU Lesser General Public License
144 +version 2.1 as published by the Free Software Foundation.
146 +This library is distributed in the hope that it will be useful, but
147 +WITHOUT ANY WARRANTY; without even the implied warranty of
148 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
149 +Lesser General Public License for more details.
151 +You should have received a copy of the GNU Lesser General Public
152 +License along with this library; if not, write to the Free Software
153 +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
156 +The full text of the LGPL version 2.1 can be found in
157 +/usr/share/common-licenses/LGPL-2.1 on most Debian and Ubuntu systems.
158 --- marquee-plugins-0.22/debian/changelog
159 +++ marquee-plugins-0.22/debian/changelog
161 +marquee-plugins (0.22-0ubuntu2mer10) jaunty; urgency=low
164 + * 64_mer_ui.patch: Adapt to Mer UI specs.
166 + -- Carsten V. Munk <cvm@cs.au.dk> Sat, 23 May 2009 12:48:56 +0000
168 +marquee-plugins (0.22-0ubuntu2) intrepid; urgency=low
170 + * 63_add-clock-plugin-close.patch: Add patch by Horace Li to add a close
171 + button to the Time & Date dialog.
172 + * Correct OriginalMaintainer -> Original-Maintainer in the control file.
175 + -- Steve Kowalik <stevenk@ubuntu.com> Mon, 11 Aug 2008 14:18:55 +1000
177 +marquee-plugins (0.22-0ubuntu1) hardy; urgency=low
180 + * Hook simple-patchsys in the build process; build-dep on cdbs; rename
181 + clean: to clean::; add apply-patches as a prereq to build:.
182 + * New upstream releases
183 + - Move to tarball release; add upstream download URL in copyright;
184 + warning, 0.4 in gutsy and 0.20, 0.21, and 0.22 in the ubuntu-mobile ppa
185 + don't match the upstream changelog below; 0.4 in gutsy disabled sed
186 + snippets in debian/marquee-plugins.postinst which are just commented our
187 + here; add the following patches for ppa changes:
188 + - 60_drop-werror-cflag: drops -Werror from CFLAGS in configure.ac.
189 + - 61_disable-screen-changed: comments out screen_changed callbacks from
190 + src/clock-plugin.c, src/close-app-plugin.c,
191 + src/drop-down-menu-plugin.c, src/showhome-plugin.c.
192 + * Wrap build-deps and deps.
193 + * Set maintainer to Ubuntu Mobile.
194 + * Bump up Standards-Version to 3.7.3.
195 + * Don't ignore distclean failures.
196 + * Call dh_* with -s in binary-arch.
197 + * Force aclocal-1.10/automake-1.10 to be used.
198 + - New patch, 62_force-automake-1.10, replaces calls to random automake and
199 + aclocal versions with calls to 1.10 versions; as autogen.sh called
200 + aclocal-1.7 || aclocal there was a risk that a developer runs
201 + aclocal-1.7/automake-1.7 in clean:: while the build daemon / environment
202 + calls aclocal/automake (currently 1.10) on top.
203 + - Version the automake build-dep to >= 1:1.10 << 1:1.11~.
204 + * Cleanup whitespace in copyright.
206 + -- Loic Minier <lool@dooz.org> Wed, 09 Apr 2008 18:01:09 +0200
208 +marquee-plugins (0.22) gaston; urgency=low
210 + * Remove marquee-plugins.schemas since category key setting in gconf
211 + is now handled in mobile-basic-flash. This is also remove original
212 + default "Mobile" as active category. New default active category is
213 + "All" that is done in mobile-basic-flash too.
215 + -- Horace Li <horace.li@intel.com> Wed, 02 Apr 2008 14:50:29 +0800
217 +marquee-plugins (0.21) gaston; urgency=low
219 + * Show up "AlL" as default category and save user changes.
221 + -- Horace Li <horace.li@intel.com> Fri, 28 Mar 2008 15:03:40 +0800
223 +marquee-plugins (0.20) gaston; urgency=low
225 + * Update marquee plugins entry plugin type field name from "X-Plugin-Type"
226 + to "Type", mainly to be compatible with upstream hildon-desktop.
228 + -- Horace Li <horace.li@intel.com> Thu, 28 Feb 2008 15:31:41 +0800
230 +marquee-plugins (0.19) gaston; urgency=low
232 + * Removed previous change by Horace which hides the down arrow when the menu
233 + is showing. The intent was to hide the down arrow when no menu exists to
236 + -- Bob Spencer <bob.spencer@intel.com> Thu, 21 Feb 2008 07:54:43 -0800
238 +marquee-plugins (0.18) gaston; urgency=low
240 + * Hide/Show arrow on titlebar when drop down menu is showed up/hide.
241 + * ellipsize (add an ellipsis: "...") to the title if there is not
242 + enough space on title bar.
244 + -- Horace Li <horace.li@intel.com> Thu, 14 Feb 2008 15:23:36 +0800
246 +marquee-plugins (0.17) gaston; urgency=low
248 + * update marquee plugins desktop entry files, according to
249 + freedesktop specification.
251 + -- Horace Li <horace.li@intel.com> Mon, 21 Jan 2008 17:50:13 +0800
253 +marquee-plugins (0.16) gaston; urgency=low
256 + * fix bug #179032, tuning status bar length to be suitable for both
257 + 800 and 1024 screen width.
258 + * Support dynamic screen resolution switch between 1024*600/1024*768
259 + and 800*480/800*600.
260 + * Cut a new release.
262 + -- Horace Li <horace.li@intel.com> Tue, 15 Jan 2008 17:31:12 +0800
264 +marquee-plugins (0.15) gaston; urgency=low
266 + * Removing the extra 'All' from the settings configuration
268 + -- Rusty Lynch <rusty.lynch@intel.com> Thu, 6 Dec 2007 03:29:19 -0800
270 +marquee-plugins (0.14) gaston; urgency=low
272 + * Adding 'Settings' to the default containers list
274 + -- Rusty Lynch <rusty.lynch@intel.com> Wed, 5 Dec 2007 00:33:05 -0800
276 +marquee-plugins (0.13) gaston; urgency=low
278 + * Increased font size of titlebar and clock
280 + -- Bob Spencer <bob.spencer@intel.com> Wed, 21 Nov 2007 16:43:57 -0800
282 +marquee-plugins (0.12) gaston; urgency=low
284 + * Adding support for an addition "All" category that the desktop
285 + launcher will interpret as "list all applications"
286 + * fixed a bug in the schema file that was causing the "active"
287 + category gconf key to be installed in the wrong location
289 + -- Rusty Lynch <rusty.lynch@intel.com> Wed, 21 Nov 2007 16:34:21 -0800
291 +marquee-plugins (0.11) gaston; urgency=low
293 + * Setting the active category to "Mobile" if no categories are listed
296 + -- Rusty Lynch <rusty.lynch@intel.com> Wed, 21 Nov 2007 11:36:55 -0800
298 +marquee-plugins (0.10) gaston; urgency=low
300 + * reworked the gconf notification code
301 + * added code to force the active category to always be the first
302 + entry in the categories list on startup
304 + -- Rusty Lynch <rusty.lynch@intel.com> Tue, 20 Nov 2007 22:51:11 -0800
306 +marquee-plugins (0.9) gaston; urgency=low
308 + * Incrementing the version info to work around a build system issue
310 + -- Rusty Lynch <rusty.lynch@intel.com> Tue, 20 Nov 2007 20:49:15 -0800
312 +marquee-plugins (0.8) gaston; urgency=low
314 + * Changing drop-down-menu-plugin implementation to list available 'views',
315 + where each view is pulled from a new marquee-plugin gconf setting. When
316 + the user selects the given view, then an 'active' gconf setting is set to
317 + the selected view, and the label on the ddm is changed to the name of the
319 + * Fixing the braindead implementation for detecting that the desktop is on
320 + top by just looking for the window title to be "Home".
321 + * Adding the first step of localizing by calling gettext() on the text
322 + for setting the drop-down-menu label
324 + -- Rusty Lynch <rusty@intel.com> Tue, 20 Nov 2007 20:29:19 -0800
326 +marquee-plugins (0.7) gaston; urgency=low
329 + * Drop down menu arrow is separate image. Can be hidden.
330 + TBD: hide arrow when no menu items exist.
335 + -- Horace Li <horace.li@intel.com> Tue, 6 Nov 2007 11:59:12 +0800
337 +marquee-plugins (0.6) gaston; urgency=low
340 + * Remove nav-next-plugin and nav-prev-plugin.
341 + * Set plug-ins height configurable according to marquee panel height.
342 + * Add home menu to access background, menus & toolbars, and about-me preference.
343 + * Re-organize the included header files.
346 + * Add calendar show-up in clock plug-in.
349 + * Cut a new release.
350 + * Move home drop-down menu up 2 pixels.
351 + * Allow only single dialog pop-up for each preference.
353 + -- Horace Li <horace.li@intel.com> Sun, 28 Oct 2007 16:31:53 +0800
355 +marquee-plugins (0.5) gaston; urgency=low
357 + * Removed dummy plugin from marquee
359 + -- Bob Spencer <bob.spencer@intel.com> Tue, 23 Oct 2007 14:28:45 -0700
361 +marquee-plugins (0.4) gaston; urgency=low
364 + * Bumping the version to get a new build and update changelog
367 + * fix launchpad bug #145936
369 + -- Bob Spencer <bob.spencer@intel.com> Wed, 12 Oct 2007 14:41:37 -0700
371 +marquee-plugins (0.3) gaston; urgency=low
374 + * Updated with new graphics from Jason
375 + * Added isascii check for graphics. Added -Werror flag. Added _XOPEN_SOURCE 600
376 + so that ctype.h would compile
378 + -- Bob Spencer <bob.spencer@intel.com> Wed, 10 Oct 2007 17:45:37 -0700
380 +marquee-plugins (0.2-1ubuntu3) feisty; urgency=low
383 + * show up last active window when showhome-plugin is clicked with desktop on-top.
385 + -- Horace Li <horace.li@intel.com> Fri, 7 Sep 2007 16:51:46 +0800
387 +marquee-plugins (0.2-1ubuntu2) gaston; urgency=low
390 + * add a new plugin to show homescreen as a replacement of applications-menu.
391 + * re-design navigator next/prev buttons event handler. this is to fix moblin bug #12
392 + * fix the bug that window title name sometimes mismatched. moblin bug #51
393 + * re-config desktop.conf and marquee.conf to set proper position for statusbar and show up
394 + 'show homescreen' plugin.
396 + -- Horace Li <horace.li@intel.com> Fri, 7 Sep 2007 16:51:46 +0800
398 +marquee-plugins (0.2-1ubuntu1) gaston; urgency=low
401 + * set nav next/prev button to switch running application instead of windows.
405 + * Changed error handling to not treat warnings as errors.
406 + Temporary quick fix to get build to complete, build complains about isascii
408 + -- Bob Spencer <bob.spencer@intel.com> Thu, 30 Aug 2007 07:49:34 -0700
410 +marquee-plugins (0.2) gutsy; urgency=low
413 + * update application menu icon size and installation path.
414 + * update drop-down-menu-size width since increase application menu width from 52 pixels
417 + [ Tollef Fog Heen ]
418 + * Remove (s) from debian/copyright to shut up lintian.
419 + * Update description.
420 + * Remove duplicates from Depends, and get rid of obsolete libwnck build
422 + * Do make distclean, not just make clean to try to get rid of generated
423 + files in the source package.
425 + -- Tollef Fog Heen <tfheen@ubuntu.com> Tue, 24 Jul 2007 16:35:38 +0200
427 +marquee-plugins (0.1-1ubuntu8) feisty; urgency=low
430 + * Performed some basic code cleanup on the nav-prev-app plugin
431 + with no new functionality
434 + * add COPYING and README, append Intel developers in AUTHORS
436 + [ Tollef Fog Heen ]
437 + * Remove useless README.Debian.
438 + * Remove shared library cruft from debian/rules.
439 + * Fix copyright to refer to /usr/share/common-licenses/LGPL-2.1
441 + -- Tollef Fog Heen <tfheen@ubuntu.com> Fri, 20 Jul 2007 09:18:50 +0200
443 +marquee-plugins (0.1-1ubuntu7) feisty; urgency=low
445 + * Enable nav buttons for "watchable" applications switching
447 + -- Horace Li <horace.li@intel.com> Wed, 11 Jul 2007 17:04:28 +0800
449 +marquee-plugins (0.1-1ubuntu6) feisty; urgency=low
451 + * Changed the clock format. Fixed reading from config so it would actually read more than one value
452 + * Changed drop down menu font, color, and made it work (not add new label each time clicked)
454 + -- Bob Spencer <bob.spencer@intel.com> Sun, 8 Jul 2007 00:42:46 -0700
456 +marquee-plugins (0.1-1ubuntu5) feisty; urgency=low
458 + * Display close button only when there is active window on the screen
460 + -- Horace Li <horace.li@intel.com> Fri, 6 Jul 2007 17:41:41 +0800
462 +marquee-plugins (0.1-1ubuntu4) feisty; urgency=low
464 + * Added support to update Window titlename
466 + -- Horace Li <horace.li@intel.com> Fri, 6 Jul 2007 16:55:59 +0800
468 +marquee-plugins (0.1-1ubuntu3) gutsy; urgency=low
470 + * Added resize for screen so plugins will fill the space for 1024 and 800
473 + -- Bob Spencer <bob.spencer@intel.com> Fri, 06 Jul 2007 08:28:48 +0000
475 +marquee-plugins (0.1-1ubuntu2) gutsy; urgency=low
477 + * added dummy statusbar plugin. Create /usr/shrae/applications/hildon-status-bar folder
479 + -- Bob Spencer <bob.spencer@intel.com> Fri, 06 Jul 2007 08:09:09 +0000
481 +marquee-plugins (0.1-1ubuntu1) gutsy; urgency=low
483 + * Plugins sized correctly for 800 width. Also graphics added
485 + -- Bob Spencer <bob.spencer@intel.com> Fri, 06 Jul 2007 00:49:44 +0000
487 +marquee-plugins (0.1-1) unstable; urgency=low
489 + * Initial checkin of Nokia example plugins
491 + -- bspencer <bob.spencer@intel.com> Mon, 02 Jul 2007 16:39:31 +0000
493 --- marquee-plugins-0.22/debian/marquee-plugins1.install
494 +++ marquee-plugins-0.22/debian/marquee-plugins1.install
497 +etc/clock-plugin.conf
498 +usr/share/pixmaps/mb_apps_menu.png
499 +usr/share/applications/hildon-marquee
500 +usr/share/applications/hildon-status-bar
501 --- marquee-plugins-0.22/debian/patches/63_add-clock-plugin-close.patch
502 +++ marquee-plugins-0.22/debian/patches/63_add-clock-plugin-close.patch
504 +diff -Nur marquee-plugins-0.22/src/clock-plugin.c marquee-plugins-0.22-new/src/clock-plugin.c
505 +--- marquee-plugins-0.22/src/clock-plugin.c 2008-05-06 07:08:44.000000000 +0000
506 ++++ marquee-plugins-0.22-new/src/clock-plugin.c 2008-05-06 07:11:34.000000000 +0000
511 ++static void clock_plugin_dialog_close (ClockPlugin *clock_plugin)
513 ++ ClockPluginPrivate *priv = CLOCK_PLUGIN_GET_PRIVATE (clock_plugin);
515 ++ if (priv->cal_dlg)
517 ++ gtk_widget_destroy (priv->cal_dlg);
518 ++ priv->cal_dlg = NULL;
522 + // Display the pop-up calendar
523 + static void on_cal_btn_clicked (GtkWidget *widget, ClockPlugin *clock_plugin)
526 + GTK_CALENDAR_SHOW_WEEK_NUMBERS);
528 + priv->cal_dlg = gtk_dialog_new ();
529 +- gtk_box_pack_start (GTK_BOX (GTK_DIALOG(priv->cal_dlg)->vbox), gtk_cal, TRUE, TRUE, 0);
530 ++ gtk_dialog_add_button (GTK_DIALOG (priv->cal_dlg), "Close", GTK_RESPONSE_CLOSE);
531 ++ g_signal_connect_swapped (GTK_DIALOG (priv->cal_dlg),
533 ++ G_CALLBACK (clock_plugin_dialog_close),
536 +- gtk_dialog_set_has_separator (GTK_DIALOG (priv->cal_dlg), FALSE);
537 ++ gtk_box_pack_start (GTK_BOX (GTK_DIALOG(priv->cal_dlg)->vbox), gtk_cal, TRUE, TRUE, 0);
539 + //set decorations, needs realizing first
540 + gtk_widget_realize (priv->cal_dlg);
541 +@@ -112,11 +127,6 @@
542 + //set the window position
543 + gtk_window_move (GTK_WINDOW (priv->cal_dlg), dlg_x, priv->panel_height+2);
547 +- gtk_widget_destroy (priv->cal_dlg);
548 +- priv->cal_dlg = NULL;
552 + static void clock_plugin_set_up_time_format (ClockPlugin *clock_plugin, gint scn_width)
553 --- marquee-plugins-0.22/debian/patches/65_matanz_mb4576.patch
554 +++ marquee-plugins-0.22/debian/patches/65_matanz_mb4576.patch
556 +diff -Nur -x '*.orig' -x '*~' marquee-plugins-0.22/src/close-app-plugin.c marquee-plugins-0.22.new/src/close-app-plugin.c
557 +--- marquee-plugins-0.22/src/close-app-plugin.c 2009-05-23 12:50:36.000000000 +0000
558 ++++ marquee-plugins-0.22.new/src/close-app-plugin.c 2009-05-23 12:50:49.000000000 +0000
561 + HD_DEFINE_PLUGIN (CloseAppPlugin, close_app_plugin, TASKNAVIGATOR_TYPE_ITEM);
564 ++get_icon_from_theme (const gchar *icon_name,
567 ++ static GtkIconTheme *icon_theme = NULL;
570 ++ GdkPixbuf *retval;
573 ++ icon_theme = gtk_icon_theme_get_default ();
578 ++ g_return_val_if_fail (icon_theme, NULL);
580 ++ if (!icon_name || icon_name[0] == '\0')
584 ++ retval = gtk_icon_theme_load_icon (icon_theme,
586 ++ size == -1 ? 48 : size,
592 ++ g_warning ("Could not load icon '%s': %s\n",
596 ++ g_error_free (error);
604 + void close_app_screen_changed (TaskNavigatorItem *item);
605 + static void close_app_finalize (GObject *object);
609 + static void close_app_plugin_init (CloseAppPlugin *close_plugin)
612 ++ GtkWidget *btn, *hbox, *arrowImg;;
615 + close_plugin->hdwm = hd_wm_get_singleton ();
618 + btn = close_plugin->btn = gtk_button_new();
620 ++ // Create the arrow image
621 ++ arrowImg = gtk_image_new_from_pixbuf (get_icon_from_theme("qgn_mer_menubutton", -1));
623 ++ //use hbox containing arrowImg and label
624 ++ hbox = gtk_hbox_new(FALSE,0);
625 ++ gtk_box_pack_start ((GtkBox*)hbox, arrowImg, FALSE, FALSE, 0);
626 ++ gtk_container_add (GTK_CONTAINER (btn), hbox);
628 + gtk_widget_set_size_request (btn, DEFAULT_MARQUEE_PANEL_HEIGHT, panel_height);
630 + g_signal_connect (btn, "clicked",
631 --- marquee-plugins-0.22/debian/patches/60_drop-werror-cflag.patch
632 +++ marquee-plugins-0.22/debian/patches/60_drop-werror-cflag.patch
634 +diff -Nur marquee-plugins-0.22/configure.ac marquee-plugins-0.22.new/configure.ac
635 +--- marquee-plugins-0.22/configure.ac 2008-04-05 04:07:53.000000000 +0200
636 ++++ marquee-plugins-0.22.new/configure.ac 2008-04-09 18:29:48.000000000 +0200
639 + #++++++++++++++++++
641 +-CFLAGS="$CFLAGS -Wall -Werror -ansi -Wmissing-prototypes -Wmissing-declarations -std=c99 -rdynamic"
642 ++CFLAGS="$CFLAGS -Wall -ansi -Wmissing-prototypes -Wmissing-declarations -std=c99 -rdynamic"
646 --- marquee-plugins-0.22/debian/patches/62_force-automake-1.10.patch
647 +++ marquee-plugins-0.22/debian/patches/62_force-automake-1.10.patch
649 +--- marquee-plugins-0.22/autogen.sh 2008-04-05 04:07:53.000000000 +0200
650 ++++ marquee-plugins-0.22.new/autogen.sh 2008-04-10 10:28:47.000000000 +0200
654 + libtoolize --automake --copy
655 +-aclocal-1.7 || aclocal
659 +-automake-1.7 --add-missing --foreign --force --copy || automake --add-missing --foreign --force --copy
660 ++automake-1.10 --add-missing --foreign --force --copy
661 --- marquee-plugins-0.22/debian/patches/61_disable-screen-changed.patch
662 +++ marquee-plugins-0.22/debian/patches/61_disable-screen-changed.patch
664 +diff -Nur marquee-plugins-0.22/src/clock-plugin.c marquee-plugins-0.22.new/src/clock-plugin.c
665 +--- marquee-plugins-0.22/src/clock-plugin.c 2008-04-05 04:07:53.000000000 +0200
666 ++++ marquee-plugins-0.22.new/src/clock-plugin.c 2008-04-09 18:35:07.000000000 +0200
668 + GObjectClass *object_class = G_OBJECT_CLASS (class);
669 + TaskNavigatorItemClass *item_class = TASKNAVIGATOR_ITEM_CLASS (class);
671 +- item_class->screen_changed = clock_plugin_screen_changed;
672 ++ //item_class->screen_changed = clock_plugin_screen_changed;
673 + object_class->finalize = clock_plugin_finalize;
675 + g_type_class_add_private (object_class, sizeof (ClockPluginPrivate));
676 +diff -Nur marquee-plugins-0.22/src/close-app-plugin.c marquee-plugins-0.22.new/src/close-app-plugin.c
677 +--- marquee-plugins-0.22/src/close-app-plugin.c 2008-04-05 04:07:53.000000000 +0200
678 ++++ marquee-plugins-0.22.new/src/close-app-plugin.c 2008-04-09 18:34:50.000000000 +0200
680 + GObjectClass *object_class = G_OBJECT_CLASS (class);
681 + TaskNavigatorItemClass *item_class = TASKNAVIGATOR_ITEM_CLASS (class);
683 +- item_class->screen_changed = close_app_screen_changed;
684 ++ //item_class->screen_changed = close_app_screen_changed;
685 + object_class->finalize = close_app_finalize;
688 +diff -Nur marquee-plugins-0.22/src/drop-down-menu-plugin.c marquee-plugins-0.22.new/src/drop-down-menu-plugin.c
689 +--- marquee-plugins-0.22/src/drop-down-menu-plugin.c 2008-04-05 04:07:53.000000000 +0200
690 ++++ marquee-plugins-0.22.new/src/drop-down-menu-plugin.c 2008-04-09 18:34:50.000000000 +0200
692 + GObjectClass *object_class = G_OBJECT_CLASS (class);
693 + TaskNavigatorItemClass *item_class = TASKNAVIGATOR_ITEM_CLASS (class);
695 +- item_class->screen_changed = drop_down_menu_screen_changed;
696 ++ //item_class->screen_changed = drop_down_menu_screen_changed;
697 + object_class->finalize = drop_down_menu_finalize;
699 + g_type_class_add_private (object_class, sizeof (DropDownMenuPluginPrivate));
700 +diff -Nur marquee-plugins-0.22/src/showhome-plugin.c marquee-plugins-0.22.new/src/showhome-plugin.c
701 +--- marquee-plugins-0.22/src/showhome-plugin.c 2008-04-05 04:07:53.000000000 +0200
702 ++++ marquee-plugins-0.22.new/src/showhome-plugin.c 2008-04-09 18:34:50.000000000 +0200
704 + GObjectClass *object_class = G_OBJECT_CLASS (class);
705 + TaskNavigatorItemClass *item_class = TASKNAVIGATOR_ITEM_CLASS (class);
707 +- item_class->screen_changed = showhome_plugin_screen_changed;
708 ++ //item_class->screen_changed = showhome_plugin_screen_changed;
709 + object_class->finalize = showhome_plugin_finalize;
712 --- marquee-plugins-0.22/debian/patches/64_mer_ui.patch
713 +++ marquee-plugins-0.22/debian/patches/64_mer_ui.patch
715 +diff -Nur -x '*.orig' -x '*~' marquee-plugins-0.22/src/common-config.h marquee-plugins-0.22.new/src/common-config.h
716 +--- marquee-plugins-0.22/src/common-config.h 2008-04-05 02:07:53.000000000 +0000
717 ++++ marquee-plugins-0.22.new/src/common-config.h 2009-05-23 12:46:00.000000000 +0000
719 + #define MARQUEE_DROPDOWN "marquee-drowdown"
720 + #define MARQUEE_ENTRY "Marquee"
721 + #define MARQUEE_HEIGHT "X-Size-Height"
722 +-#define HILDON_DESKTOP_CONFIG "/etc/hildon-desktop/desktop.conf"
723 ++#define HILDON_DESKTOP_CONFIG "~/.osso/hildon-desktop/desktop.conf"
725 + void plugins_popup_preference (const gchar *pref_id);
726 + gint plugins_get_marquee_panel_height (void);
727 +diff -Nur -x '*.orig' -x '*~' marquee-plugins-0.22/src/drop-down-menu-plugin.c marquee-plugins-0.22.new/src/drop-down-menu-plugin.c
728 +--- marquee-plugins-0.22/src/drop-down-menu-plugin.c 2009-05-23 12:45:33.000000000 +0000
729 ++++ marquee-plugins-0.22.new/src/drop-down-menu-plugin.c 2009-05-23 12:46:00.000000000 +0000
731 + #include <ctype.h> //for isascii (menu title)
732 + #include <X11/Xatom.h>
733 + #include <gconf/gconf-client.h>
734 ++#include <libhildonwm/hd-wm.h>
735 ++#include <libhildondesktop/hildon-home-window.h>
737 + #include "drop-down-menu-plugin.h"
740 + static gboolean home_menu_hide_cb (GtkWidget *widget, gpointer user_data);
741 + static gboolean home_menu_show_cb (GtkWidget *widget, gpointer user_data);
744 ++get_icon_from_theme (const gchar *icon_name,
747 ++ static GtkIconTheme *icon_theme = NULL;
750 ++ GdkPixbuf *retval;
753 ++ icon_theme = gtk_icon_theme_get_default ();
758 ++ g_return_val_if_fail (icon_theme, NULL);
760 ++ if (!icon_name || icon_name[0] == '\0')
764 ++ retval = gtk_icon_theme_load_icon (icon_theme,
766 ++ size == -1 ? 48 : size,
772 ++ g_warning ("Could not load icon '%s': %s\n",
776 ++ g_error_free (error);
785 + static void updateDownArrow (DropDownMenuPlugin *ddm_plugin, gboolean hasMenuItems)
787 + // find out if current app has any menu items
788 +@@ -304,18 +348,10 @@
792 +- GtkWidget *home_menu;
794 +- home_menu = drop_down_menu_create_home_menu (ddm_plugin);
795 +- g_signal_connect (G_OBJECT (home_menu), "hide",
796 +- G_CALLBACK (home_menu_hide_cb), ddm_plugin);
797 +- g_signal_connect (G_OBJECT (home_menu), "show",
798 +- G_CALLBACK (home_menu_show_cb), ddm_plugin);
799 +- gtk_menu_popup (GTK_MENU(home_menu),
801 +- drop_down_menu_position_func, ddm_plugin,
803 +- gtk_get_current_event_time());
804 ++ /* XXX: EVIL EVIL EVIL HACK */
805 ++ HDWM *wm = hd_wm_get_singleton ();
806 ++ HildonHomeWindow *hmw = hd_wm_get_hildon_home_window(wm);
807 ++ hildon_home_window_toggle_menu(hmw);
811 +@@ -346,44 +382,15 @@
812 + scn_width = gdk_screen_get_width (screen);
815 +- if (scn_width > 600)
816 +- plugin_width = 52 * (3 + scn_width / 320);
818 +- plugin_width = scn_width - 52 * (5 + scn_width / 320);
820 ++ plugin_width = 90;
821 + gtk_widget_set_size_request (GTK_WIDGET(ddm_plugin), plugin_width, panel_height);
823 + // Create the arrow image
824 +- arrowImg = gtk_image_new_from_file (THEME_DIR "/images/mb_marquee_btn_title_arrow.png");
826 +- // Create label and set font
827 +- label = gtk_label_new (NULL);
829 +- //set the font size smaller
830 +- PangoAttribute *pa_size = pango_attr_size_new (17000);
831 +- pa_size->start_index = 0;
832 +- pa_size->end_index = -1;
833 +- PangoAttribute *pa_font = pango_attr_family_new ("Sans");
834 +- pa_font->start_index = 0;
835 +- pa_font->end_index = -1;
836 +- PangoAttribute *pa_color = pango_attr_foreground_new (0xE2E1,0xE2E1,0xE2E1);
837 +- pa_color->start_index = 0;
838 +- pa_color->end_index = -1;
839 +- PangoAttrList *pl = pango_attr_list_new();
840 +- pango_attr_list_insert(pl,pa_size);
841 +- pango_attr_list_insert(pl,pa_font);
842 +- pango_attr_list_insert(pl,pa_color);
844 +- gtk_label_set_attributes ((GtkLabel*)label, pl);
845 +- pango_attr_list_unref (pl);
847 +- //gtk_label_set_justify ((GtkLabel*)label, GTK_JUSTIFY_LEFT);
848 +- gtk_misc_set_alignment((GtkMisc*)label, 0.0, 0.5);
849 ++ arrowImg = gtk_image_new_from_pixbuf (get_icon_from_theme("qgn_mer_menubutton", -1));
851 + //use hbox containing arrowImg and label
852 + hbox = gtk_hbox_new(FALSE,0);
853 + gtk_box_pack_start ((GtkBox*)hbox, arrowImg, FALSE, FALSE, 0);
854 +- gtk_container_add (GTK_CONTAINER(hbox), label);
855 + gtk_container_add (GTK_CONTAINER (btn), hbox);
858 +@@ -418,10 +425,7 @@
859 + GList *children, *iter;
861 + scn_width = gdk_screen_get_width (screen);
862 +- if (scn_width > 600)
863 +- width = 52 * (3 + scn_width / 320);
865 +- width = scn_width - 52 * (5 + scn_width / 320);
867 + height = plugins_get_marquee_panel_height ();
869 + children = gtk_container_get_children (GTK_CONTAINER(item));