Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/ibar
Modified Files:
e_mod_main.c
Log Message:
1. fix segv dnd border icon to ibar
2. border icon if from netwm has alpha set :)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibar/e_mod_main.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -3 -r1.76 -r1.77
--- e_mod_main.c 26 Sep 2005 10:03:49 -0000 1.76
+++ e_mod_main.c 27 Sep 2005 03:57:03 -0000 1.77
@@ -1683,10 +1683,33 @@
app = e_app_window_name_class_title_role_find(bd->client.icccm.name,
bd->client.icccm.class,
title,
bd->client.icccm.window_role);
-
+ if (!app)
+ {
+ app = e_app_launch_id_pid_find(bd->client.netwm.e_start_launch_id,
+ bd->client.netwm.pid);
+ }
+ if (!app)
+ {
+ E_Dialog *dia;
+
+ dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
+ e_dialog_title_set(dia, _("Cannot add icon"));
+ e_dialog_text_set(dia,
+ _("You tried to drop an icon of an application
that<br>"
+ "does not have a matching application file.<br>"
+ "<br>"
+ "The icon cannot be added to IBar."
+ ));
+ e_dialog_button_add(dia, _("OK"), NULL, NULL, NULL);
+ e_dialog_button_focus_num(dia, 1);
+ e_win_centered_set(dia->win, 1);
+ e_dialog_show(dia);
+ return;
+ }
/* add dropped element */
ic = _ibar_icon_pos_find(ibb, ev->x, ev->y);
-
+ if (!ic) return;
+
/* remove drag marker */
e_box_freeze(ibb->box_object);
e_box_unpack(ibb->drag_object);
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
