summaryrefslogtreecommitdiff
path: root/packages/matchbox-applet-inputmanager/files/update-to-svn.diff
diff options
context:
space:
mode:
authorCliff Brake <cbrake@bec-systems.com>2006-11-13 19:10:05 +0000
committerCliff Brake <cbrake@bec-systems.com>2006-11-13 19:10:05 +0000
commitf7171587f09b13c97cc73109cd9eaf7c5aa78e47 (patch)
treeb5946293f56e4dee2d643c5c411ed77405f4001f /packages/matchbox-applet-inputmanager/files/update-to-svn.diff
parent38d9e8aff1967820b22faeea83610c3c359f7705 (diff)
parent40951de5f883d7a2d9d5445a9b73c3424ee245f1 (diff)
merge of '119a1b8e3787f193a0a34391450debc2878897c4'
and '4f36e4b6e145cb3251f372bb7153308459b7ea41'
Diffstat (limited to 'packages/matchbox-applet-inputmanager/files/update-to-svn.diff')
-rw-r--r--packages/matchbox-applet-inputmanager/files/update-to-svn.diff33
1 files changed, 33 insertions, 0 deletions
diff --git a/packages/matchbox-applet-inputmanager/files/update-to-svn.diff b/packages/matchbox-applet-inputmanager/files/update-to-svn.diff
new file mode 100644
index 0000000000..6ec68a0ea2
--- /dev/null
+++ b/packages/matchbox-applet-inputmanager/files/update-to-svn.diff
@@ -0,0 +1,33 @@
+--- /tmp/mbinputmgr-tray.c 2006-11-11 14:11:02.000000000 +0100
++++ mb-applet-input-manager-0.6/mbinputmgr-tray.c 2006-11-11 14:11:43.638554000 +0100
+@@ -228,6 +228,15 @@
+ || (!mb_tray_app_tray_is_vertical (app) && x > IconWidth) )
+ {
+ mb_tray_app_get_absolute_coords (app, &abs_x, &abs_y);
++
++ /* aligned top, position down a little */
++ if (abs_y < 8)
++ {
++ int w, h;
++ mb_menu_get_root_menu_size(PopupMenu, &w, &h);
++ abs_y = h + IconDim + 2;
++ }
++
+ mb_menu_activate(PopupMenu, abs_x, abs_y);
+ ButtonActive = BUTTON_MENU;
+ }
+@@ -257,14 +266,10 @@
+ {
+ if (ev->type == ClientMessage)
+ {
+- printf("beep\n");
+-
+ XClientMessageEvent *cmev = (XClientMessageEvent *)&ev->xconfigure;
+
+ if (cmev->message_type == AtomIMActivate)
+ {
+- printf("beep\n");
+-
+ /* De Activate */
+ if (cmev->data.l[0] == 0 && mbinputmgr_method_active(Inpmgr_state))
+ mbinputmgr_toggle_selected_method (Inpmgr_state);