Send commitlog mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r1347 - trunk/src/target/OM-2007/applications/openmoko-today
([EMAIL PROTECTED])
2. r1348 - trunk/src/target/OM-2007/applications/openmoko-today
([EMAIL PROTECTED])
3. r1349 -
trunk/src/target/OM-2007/applications/openmoko-appmanager/data
([EMAIL PROTECTED])
4. r1350 -
trunk/src/target/OM-2007/applications/openmoko-appmanager/src
([EMAIL PROTECTED])
5. r1351 -
trunk/src/target/OM-2007/applications/openmoko-appmanager/data
([EMAIL PROTECTED])
6. r1352 -
trunk/src/target/OM-2007/applications/openmoko-dialer/data
([EMAIL PROTECTED])
7. r1353 -
trunk/src/target/OM-2007/applications/openmoko-dialer/data
([EMAIL PROTECTED])
8. r1354 -
trunk/src/target/OM-2007/applications/openmoko-mainmenu/data
([EMAIL PROTECTED])
9. r1355 -
trunk/src/target/OM-2007/applications/openmoko-taskmanager/data
([EMAIL PROTECTED])
10. r1356 -
trunk/src/target/OM-2007/applications/openmoko-mainmenu/data
([EMAIL PROTECTED])
11. r1357 -
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src
([EMAIL PROTECTED])
--- Begin Message ---
Author: dodji
Date: 2007-03-13 18:00:05 +0100 (Tue, 13 Mar 2007)
New Revision: 1347
Modified:
trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog
trunk/src/target/OM-2007/applications/openmoko-today/autogen.sh
Log:
Remove specifif --prefix from autogen.sh
Modified: trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog
2007-03-13 16:52:01 UTC (rev 1346)
+++ trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog
2007-03-13 17:00:05 UTC (rev 1347)
@@ -1,3 +1,7 @@
+Tue, 13 Mar 2007 17:53:33 +0100 Dodji Seketeli <[EMAIL PROTECTED]>
+
+ * autogen.sh: remove my specific --prefix
+
Tue, 13 Mar 2007 17:31:00 +0100 Dodji Seketeli <[EMAIL PROTECTED]>
* src/today-events-area.c,h: initial attempt at coding an
Modified: trunk/src/target/OM-2007/applications/openmoko-today/autogen.sh
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-today/autogen.sh
2007-03-13 16:52:01 UTC (rev 1346)
+++ trunk/src/target/OM-2007/applications/openmoko-today/autogen.sh
2007-03-13 17:00:05 UTC (rev 1347)
@@ -18,6 +18,6 @@
echo "You need to install gnome-common from the GNOME CVS"
exit 1
}
-USE_GNOME2_MACROS=1 . gnome-autogen.sh --prefix=/home/dodji/prefix/om
+USE_GNOME2_MACROS=1 . gnome-autogen.sh
--- End Message ---
--- Begin Message ---
Author: dodji
Date: 2007-03-13 18:00:11 +0100 (Tue, 13 Mar 2007)
New Revision: 1348
Modified:
trunk/src/target/OM-2007/applications/openmoko-today/configure.ac
Log:
Revert specifics from configure.ac
Modified: trunk/src/target/OM-2007/applications/openmoko-today/configure.ac
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-today/configure.ac
2007-03-13 17:00:05 UTC (rev 1347)
+++ trunk/src/target/OM-2007/applications/openmoko-today/configure.ac
2007-03-13 17:00:11 UTC (rev 1348)
@@ -25,9 +25,6 @@
libebook-1.2 >= $LIBEBOOK_VERSION
libecal-1.2 >= $LIBEBOOK_VERSION)
-AC_SUBST(TODAY_LIBS)
-AC_SUBST(TODAY_CFLAGS)
-
if test x$TODAY_DEVEL != x ; then
CFLAGS="-Wall -Wextra -Wshadow -Wpointer-arith -g"
fi
--- End Message ---
--- Begin Message ---
Author: caowai_song
Date: 2007-03-14 02:32:02 +0100 (Wed, 14 Mar 2007)
New Revision: 1349
Added:
trunk/src/target/OM-2007/applications/openmoko-appmanager/data/application-manager.png
trunk/src/target/OM-2007/applications/openmoko-appmanager/data/openmoko-appmanager.desktop
Modified:
trunk/src/target/OM-2007/applications/openmoko-appmanager/data/Makefile.am
Log:
Add the desktop files to the application manager.
It should be changed when support multi language.
Modified:
trunk/src/target/OM-2007/applications/openmoko-appmanager/data/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/data/Makefile.am
2007-03-13 17:00:11 UTC (rev 1348)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/data/Makefile.am
2007-03-14 01:32:02 UTC (rev 1349)
@@ -15,3 +15,14 @@
package-upgrade.png\
unkown.png
+#
+# desktop integration: .desktop file
+#
+desktopdir = $(datadir)/applications
+dist_desktop_DATA = openmoko-appmanager.desktop
+
+#
+# desktop integration: application icon
+#
+appicondir = $(datadir)/icons
+dist_appicon_DATA = application-manager.png
Added:
trunk/src/target/OM-2007/applications/openmoko-appmanager/data/application-manager.png
===================================================================
(Binary files differ)
Property changes on:
trunk/src/target/OM-2007/applications/openmoko-appmanager/data/application-manager.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added:
trunk/src/target/OM-2007/applications/openmoko-appmanager/data/openmoko-appmanager.desktop
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-appmanager/data/openmoko-appmanager.desktop
2007-03-13 17:00:11 UTC (rev 1348)
+++
trunk/src/target/OM-2007/applications/openmoko-appmanager/data/openmoko-appmanager.desktop
2007-03-14 01:32:02 UTC (rev 1349)
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=OpenMoko Appmanager
+Comment=OpenMoko Application Manager
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Exec=openmoko-appmanager
+Icon=application-manager.png
+Categories=GTK;Application;
+Terminal=false
+SingleInstance=true
+StartupNotify=true
--- End Message ---
--- Begin Message ---
Author: caowai_song
Date: 2007-03-14 02:40:41 +0100 (Wed, 14 Mar 2007)
New Revision: 1350
Modified:
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-window.c
Log:
Because the windows-manager will sure that the application will only
run once, remove the unuseful code in the application manager.
Modified:
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-window.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-window.c
2007-03-14 01:32:02 UTC (rev 1349)
+++
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-window.c
2007-03-14 01:40:41 UTC (rev 1350)
@@ -17,13 +17,6 @@
*
* @author Chaowei Song ([EMAIL PROTECTED])
*/
-
-#include <unistd.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <signal.h>
-
#include <libmokoui/moko-application.h>
#include <libmokoui/moko-paned-window.h>
#include <libmokoui/moko-tool-box.h>
@@ -41,82 +34,6 @@
#include "package-list.h"
#include "select-menu.h"
-static GtkWidget* mainwindow = NULL;
-
-static void
-handle_sigusr1 (int value)
-{
- if (mainwindow == NULL)
- {
- return;
- }
- gtk_window_present (GTK_WINDOW (mainwindow));
- signal (SIGUSR1, handle_sigusr1);
-}
-
-static pid_t
-testlock (char *fname)
-{
- int fd;
- struct flock fl;
-
- fd = open (fname, O_WRONLY, S_IWUSR);
- if (fd < 0)
- {
- if (errno == ENOENT)
- {
- return 0;
- }
- else
- {
- perror ("Test lock open file");
- return -1;
- }
- }
-
- fl.l_type = F_WRLCK;
- fl.l_whence = SEEK_SET;
- fl.l_start = 0;
- fl.l_len = 0;
-
- if (fcntl (fd, F_GETLK, &fl) < 0)
- {
- close (fd);
- return -1;
- }
- close (fd);
-
- if (fl.l_type == F_UNLCK)
- return 0;
-
- return fl.l_pid;
-}
-
-static void
-setlock (char *fname)
-{
- int fd;
- struct flock fl;
-
- fd = open (fname, O_WRONLY|O_CREAT, S_IWUSR);
- if (fd < 0)
- {
- perror ("Set lock open file");
- return ;
- }
-
- fl.l_type = F_WRLCK;
- fl.l_whence = SEEK_SET;
- fl.l_start = 0;
- fl.l_len = 0;
-
- if (fcntl (fd, F_SETLK, &fl) < 0)
- {
- perror ("Lock file");
- close (fd);
- }
-}
-
/**
* @brief The start function.
*/
@@ -133,7 +50,6 @@
GtkWidget *detail;
gint ret;
- pid_t lockapp;
g_debug ("appplication manager start up");
@@ -143,13 +59,6 @@
{
/* Add init code. */
}
- lockapp = testlock ("/tmp/appmgr.lock");
- if (lockapp > 0)
- {
- kill (lockapp, SIGUSR1);
- return 0;
- }
- setlock ("/tmp/appmgr.lock");
appdata = application_manager_data_new ();
if (appdata == NULL)
@@ -165,9 +74,6 @@
G_CALLBACK (gtk_main_quit), NULL);
application_manager_data_set_main_window (appdata, window);
- /* Save the main window */
- mainwindow = GTK_WIDGET(window);
-
appmenu = application_menu_new (appdata);
moko_paned_window_set_application_menu (window, appmenu);
@@ -204,8 +110,6 @@
package_list_add_section_to_filter_menu (appdata);
- signal (SIGUSR1, handle_sigusr1);
-
gtk_widget_show_all (GTK_WIDGET (window));
g_debug ("application manager enter main loop");
gtk_main ();
--- End Message ---
--- Begin Message ---
Author: caowai_song
Date: 2007-03-14 03:02:37 +0100 (Wed, 14 Mar 2007)
New Revision: 1351
Modified:
trunk/src/target/OM-2007/applications/openmoko-appmanager/data/Makefile.am
trunk/src/target/OM-2007/applications/openmoko-appmanager/data/openmoko-appmanager.desktop
Log:
Now the application-manager.png will install to /usr/share/pixmaps
Modified:
trunk/src/target/OM-2007/applications/openmoko-appmanager/data/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/data/Makefile.am
2007-03-14 01:40:41 UTC (rev 1350)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/data/Makefile.am
2007-03-14 02:02:37 UTC (rev 1351)
@@ -24,5 +24,5 @@
#
# desktop integration: application icon
#
-appicondir = $(datadir)/icons
+appicondir = $(datadir)/pixmaps
dist_appicon_DATA = application-manager.png
Modified:
trunk/src/target/OM-2007/applications/openmoko-appmanager/data/openmoko-appmanager.desktop
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-appmanager/data/openmoko-appmanager.desktop
2007-03-14 01:40:41 UTC (rev 1350)
+++
trunk/src/target/OM-2007/applications/openmoko-appmanager/data/openmoko-appmanager.desktop
2007-03-14 02:02:37 UTC (rev 1351)
@@ -5,7 +5,7 @@
Version=1.0
Type=Application
Exec=openmoko-appmanager
-Icon=application-manager.png
+Icon=application-manager
Categories=GTK;Application;
Terminal=false
SingleInstance=true
--- End Message ---
--- Begin Message ---
Author: ken_zhao
Date: 2007-03-14 03:03:03 +0100 (Wed, 14 Mar 2007)
New Revision: 1352
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/data/Makefile.am
Log:
change openmoko-dialer.desktop install directory
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/data/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/data/Makefile.am
2007-03-14 02:02:37 UTC (rev 1351)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/data/Makefile.am
2007-03-14 02:03:03 UTC (rev 1352)
@@ -68,7 +68,7 @@
#
# desktop integration: .desktop file
#
-desktopdir = $(datadir)/applications
+desktopdir = $(datadir)/pixmaps
dist_desktop_DATA = openmoko-dialer.desktop
#
--- End Message ---
--- Begin Message ---
Author: ken_zhao
Date: 2007-03-14 03:08:35 +0100 (Wed, 14 Mar 2007)
New Revision: 1353
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/data/Makefile.am
trunk/src/target/OM-2007/applications/openmoko-dialer/data/openmoko-dialer.desktop
Log:
change Icon in openmoko-dialer.desktop and install directory
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/data/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/data/Makefile.am
2007-03-14 02:03:03 UTC (rev 1352)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/data/Makefile.am
2007-03-14 02:08:35 UTC (rev 1353)
@@ -68,12 +68,12 @@
#
# desktop integration: .desktop file
#
-desktopdir = $(datadir)/pixmaps
+desktopdir = $(datadir)/applications
dist_desktop_DATA = openmoko-dialer.desktop
#
# desktop integration: application icon
#
-appicondir = $(datadir)/icons
+appicondir = $(datadir)/pixmaps
dist_appicon_DATA = connecting.png
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/data/openmoko-dialer.desktop
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-dialer/data/openmoko-dialer.desktop
2007-03-14 02:03:03 UTC (rev 1352)
+++
trunk/src/target/OM-2007/applications/openmoko-dialer/data/openmoko-dialer.desktop
2007-03-14 02:08:35 UTC (rev 1353)
@@ -3,7 +3,7 @@
Name=Openmoko-dialer
Comment=dialer
Exec=openmoko-dialer
-Icon=connecting.png
+Icon=connecting
Terminal=false
Type=Application
Categories=GTK;Application;PIM;Office
--- End Message ---
--- Begin Message ---
Author: caowai_song
Date: 2007-03-14 03:13:23 +0100 (Wed, 14 Mar 2007)
New Revision: 1354
Modified:
trunk/src/target/OM-2007/applications/openmoko-mainmenu/data/Makefile.am
trunk/src/target/OM-2007/applications/openmoko-mainmenu/data/openmoko-mainmenu.desktop
Log:
Fix the problem that the application icon install to wrong directory
Modified:
trunk/src/target/OM-2007/applications/openmoko-mainmenu/data/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/data/Makefile.am
2007-03-14 02:08:35 UTC (rev 1353)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/data/Makefile.am
2007-03-14 02:13:23 UTC (rev 1354)
@@ -18,5 +18,5 @@
#
# desktop integration: application icon
#
-appicondir = $(datadir)/icons
+appicondir = $(datadir)/pixmaps
dist_appicon_DATA = openmoko-mainmenu.png
Modified:
trunk/src/target/OM-2007/applications/openmoko-mainmenu/data/openmoko-mainmenu.desktop
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-mainmenu/data/openmoko-mainmenu.desktop
2007-03-14 02:08:35 UTC (rev 1353)
+++
trunk/src/target/OM-2007/applications/openmoko-mainmenu/data/openmoko-mainmenu.desktop
2007-03-14 02:13:23 UTC (rev 1354)
@@ -5,7 +5,7 @@
Version=1.0
Type=Application
Exec=openmoko-mainmenu
-Icon=openmoko-mainmenu.png
+Icon=openmoko-mainmenu
Terminal=false
SingleInstance=true
StartupNotify=true
--- End Message ---
--- Begin Message ---
Author: caowai_song
Date: 2007-03-14 03:15:28 +0100 (Wed, 14 Mar 2007)
New Revision: 1355
Modified:
trunk/src/target/OM-2007/applications/openmoko-taskmanager/data/Makefile.am
trunk/src/target/OM-2007/applications/openmoko-taskmanager/data/openmoko-taskmanager.desktop
Log:
Fix the problem that the application icon install to wrong directory
Modified:
trunk/src/target/OM-2007/applications/openmoko-taskmanager/data/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-taskmanager/data/Makefile.am
2007-03-14 02:13:23 UTC (rev 1354)
+++ trunk/src/target/OM-2007/applications/openmoko-taskmanager/data/Makefile.am
2007-03-14 02:15:28 UTC (rev 1355)
@@ -21,5 +21,5 @@
#
# desktop integration: application icon
#
-appicondir = $(datadir)/icons
+appicondir = $(datadir)/pixmaps
dist_appicon_DATA = openmoko-taskmanager.png
Modified:
trunk/src/target/OM-2007/applications/openmoko-taskmanager/data/openmoko-taskmanager.desktop
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-taskmanager/data/openmoko-taskmanager.desktop
2007-03-14 02:13:23 UTC (rev 1354)
+++
trunk/src/target/OM-2007/applications/openmoko-taskmanager/data/openmoko-taskmanager.desktop
2007-03-14 02:15:28 UTC (rev 1355)
@@ -5,7 +5,7 @@
Version=1.0
Type=Application
Exec=openmoko-taskmanager
-Icon=openmoko-taskmanager.png
+Icon=openmoko-taskmanager
Terminal=false
SingleInstance=true
StartupNotify=true
--- End Message ---
--- Begin Message ---
Author: ken_zhao
Date: 2007-03-14 03:25:14 +0100 (Wed, 14 Mar 2007)
New Revision: 1356
Modified:
trunk/src/target/OM-2007/applications/openmoko-mainmenu/data/openmoko-mainmenu.png
Log:
change icon for main menu
Modified:
trunk/src/target/OM-2007/applications/openmoko-mainmenu/data/openmoko-mainmenu.png
===================================================================
(Binary files differ)
--- End Message ---
--- Begin Message ---
Author: zhiyong_sun
Date: 2007-03-14 03:55:14 +0100 (Wed, 14 Mar 2007)
New Revision: 1357
Modified:
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/dbus-conn.h
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokoiconview.c
Log:
change item activate function.
Modified:
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/dbus-conn.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/dbus-conn.h
2007-03-14 02:25:14 UTC (rev 1356)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/dbus-conn.h
2007-03-14 02:55:14 UTC (rev 1357)
@@ -20,6 +20,10 @@
*/
#ifndef MOKO_DBUS_MESSAGE_SEND_H
#define MOKO_DBUS_MESSAGE_SEND_H
+
+#ifndef DBUS_API_SUBJECT_TO_CHANGE
+#define DBUS_API_SUBJECT_TO_CHANGE
+#endif /*DBUS_API_SUBJECT_TO_CHANGE*/
#include <glib.h>
#include <dbus/dbus-glib.h>
#include <dbus/dbus.h>
Modified:
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokoiconview.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokoiconview.c
2007-03-14 02:25:14 UTC (rev 1356)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokoiconview.c
2007-03-14 02:55:14 UTC (rev 1357)
@@ -99,7 +99,6 @@
gint decr_width;
gboolean decorated;
gint total_items;
- gboolean activate;
guint ctrl_pressed : 1;
guint shift_pressed : 1;
@@ -1507,10 +1506,9 @@
if (event->button == 1 && event->type == GDK_BUTTON_PRESS)
{
-
item = moko_icon_view_get_item_at_pos (icon_view,
event->x, event->y);
-
+
if (item != NULL)
{
moko_icon_view_scroll_to_item (icon_view, item);
@@ -1526,9 +1524,9 @@
moko_icon_view_set_cursor_item (icon_view, item);
if (!icon_view->priv->anchor_item)
- icon_view->priv->anchor_item = item;
+ icon_view->priv->anchor_item = item;
else
- moko_icon_view_select_all_between (icon_view,
+ moko_icon_view_select_all_between (icon_view,
icon_view->priv->anchor_item,
item);
dirty = TRUE;
@@ -1547,13 +1545,20 @@
{
if (!item->selected)
{
- moko_icon_view_unselect_all_internal (icon_view);
-
+ moko_icon_view_unselect_all_internal (icon_view);
item->selected = TRUE;
moko_icon_view_queue_draw_item (icon_view, item);
dirty = TRUE;
}
- else icon_view->priv->activate = TRUE;
+ else
+ {
+ GtkTreePath *path;
+ path = gtk_tree_path_new_from_indices (item->index, -1);
+ moko_icon_view_item_activated (icon_view, path);
+ gtk_tree_path_free (path);
+
+ icon_view->priv->last_single_clicked = NULL;
+ }
}
moko_icon_view_set_cursor_item (icon_view, item);
icon_view->priv->anchor_item = item;
@@ -1583,23 +1588,6 @@
}
}
-
- if (event->button == 1 && event->type == GDK_2BUTTON_PRESS)
- {
- item = moko_icon_view_get_item_at_pos (icon_view,
- event->x, event->y);
-
- if (item && item == icon_view->priv->last_single_clicked)
- {
- GtkTreePath *path;
-
- path = gtk_tree_path_new_from_indices (item->index, -1);
- moko_icon_view_item_activated (icon_view, path);
- gtk_tree_path_free (path);
- }
-
- icon_view->priv->last_single_clicked = NULL;
- }
if (dirty)
g_signal_emit (icon_view, moko_icon_view_signals[SELECTION_CHANGED], 0);
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
