merge notification with AUTHORS and remove duplicatre files. icon also

now trimmed. also use propr module namespacing for theme.



SVN revision: 79706

AUTHORS

@@ -43,3 +43,4 @@ Eduardo Lima (Etrunko) <eblima@gmail.com>
 Thanatermesis <thanatermesis.ecvs@gmail.com>
 Bruno Dilly <bdilly@profusion.mobi>
 Lucas De Marchi <lucas.demarchi@profusion.mobi>
+Samuel Mendes <heka.lok@gmail.com>

src/modules/notification/COPYING

@@ -1,32 +0,0 @@
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies of the Software and its Copyright notices. In addition publicly
-documented acknowledgment must be given that this software has been used if no
-source code of this software is made available publicly. Making the source
-available publicly means including the source for this software with the
-distribution, or a method to get this software via some reasonable mechanism
-(electronic transfer via a network or media) as well as making an offer to
-supply the source on request. This Copyright notice serves as an offer to
-supply the source on on request as well. Instead of this, supplying
-acknowledgments of use of this software in either Copyright notices, Manuals,
-Publicity and Marketing documents or any documentation provided with any
-product containing this software. This License does not apply to any software
-that links to the libraries provided by this software (statically or
-dynamically), but only to the software provided.
-
-Please see the COPYING-PLAIN for a plain-english explanation of this notice
-and its intent.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

src/modules/notification/COPYING-PLAIN

@@ -1,33 +0,0 @@
-Plain English Copyright Notice
-
-This file is not intended to be the actual License. The reason this file
-exists is that we here are programmers and engineers. We aren't lawyers. We
-provide licenses that we THINK say the right things, but we have our own
-intentions at heart. This is a plain-english explanation of what those
-intentions are, and if you follow them you will be within the "spirit" of
-the license.
-
-The intent is for us to enjoy writing software that is useful to us (the
-AUTHORS) and allow others to use it freely and also benefit from the work we
-put into making it. We don't want to restrict others using it. They should
-not *HAVE* to make the source code of the applications they write that
-simply link to these libraries (be that statically or dynamically), or for
-them to be limited as to what license they choose to use (be it open, closed
-or anything else). But we would like to know you are using these libraries.
-We simply would like to know that it has been useful to someone. This is why
-we ask for acknowledgement of some sort.
-
-You can do what you want with the source of this software - it doesn't
-matter. We still have it here for ourselves and it is open and free to use
-and download and play with. It can't be taken away. We don't really mind what
-you do with the source to your software. We would simply like to know that
-you are using it - especially if it makes it to a commerical product. If you
-simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
-then make sure you include a paragraph or page in the manual for the product
-with the copyright notice and state that you used this software, we will be
-very happy. If you want to contribute back modifications and fixes you may have
-made we will welcome those too with open arms (generally). If you want help
-with changes needed, ports needed or features to be added, arrangements can
-be easily made with some dialogue.
-
-Samuel Mendes <heka.lok@gmail.com>

src/modules/notification/README

@@ -1,28 +0,0 @@
-Notification
-
-This module provide a notification daemon for E.
-It implements the galago specification :
-http://www.galago-project.org/specs/notification/0.9/index.html
-
-You can be notified in two ways, by popups or by icons. Popups are the usual way
-of notifying, you can configure where they should appear and some other options
-in E's configuration panel -> extensions -> notification. Notification box is a
-gadget with the same style as ibox and go into a shelf. If an event occur the
-image associated with the event (or this modules's logo if none) will appear
-inside the box. A click on it will try to focus the source application of the
-event, by matching the "application name" field with any windows class/name.
-Configure a notification box is done by right clicking on it and selecting
-"configuration".
-
-By configuring which level of urgency popups and box should show, you can avoid
-having both showing up everytime.
-
-The icon displayed in the box may be ugly and aliased. It's due to the fact that
-some apps use really small icons. An easy way to fix this is to make sure that
-the application doesn't send a pixbuf but a path to the icon instead. And if this
-icon is too small, replace it by a bigger one.
-
-If you want to fire up a notification and make the module focus an application,
-the easiest way is to use e-notify-send (in e_dbus if built with enotify) like
-in this example:
-e-notify-send -n classname_of_your_app -i "file:///path/to/an/icon" "foo" "bar"

src/modules/notification/e_mod_box.c

@@ -333,8 +333,10 @@ _notification_box_icon_fill(Notification_Box_Icon *ic,
         snprintf(buf, sizeof(buf), "%s/e-module-notification.edj", notification_mod->dir);
         dummy = edje_object_add(evas_object_evas_get(ic->n_box->o_box));
         if (!e_theme_edje_object_set(dummy, "base/theme/modules/notification",
+                                     "e/modules/notification/logo"))
+          if (!e_theme_edje_object_set(dummy, "base/theme/modules/notification",
                                      "modules/notification/logo"))
-          edje_object_file_set(dummy, buf, "modules/notification/logo");
+            edje_object_file_set(dummy, buf, "modules/notification/logo");
         evas_object_resize(dummy, 80, 80);
         app_icon = (Evas_Object*)edje_object_part_object_get(dummy, "image");
      }

src/modules/notification/e_mod_popup.c

@@ -297,8 +297,11 @@ _notification_popup_new(E_Notification *n)
 
    if (!e_theme_edje_object_set(popup->theme,
                                 "base/theme/modules/notification",
-                                "modules/notification/main"))
-     edje_object_file_set(popup->theme, buf, "modules/notification/main");
+                                "e/modules/notification/main"))
+     if (!e_theme_edje_object_set(popup->theme,
+                                  "base/theme/modules/notification",
+                                  "modules/notification/main"))
+       edje_object_file_set(popup->theme, buf, "modules/notification/main");
 
    e_popup_edje_bg_object_set(popup->win, popup->theme);
 
@@ -488,9 +491,12 @@ _notification_popup_refresh(Popup_Data *popup)
         popup->app_icon = edje_object_add(popup->e);
         if (!e_theme_edje_object_set(popup->app_icon, 
                                      "base/theme/modules/notification",
-                                     "modules/notification/logo"))
-          edje_object_file_set(popup->app_icon, buf, 
-                               "modules/notification/logo");
+                                     "e/modules/notification/logo"))
+          if (!e_theme_edje_object_set(popup->app_icon, 
+                                       "base/theme/modules/notification",
+                                       "modules/notification/logo"))
+            edje_object_file_set(popup->app_icon, buf, 
+                                 "modules/notification/logo");
         w = width;
         h = height;
      }

src/modules/notification/e_modules-notification.spec.in

@@ -1,48 +0,0 @@
-%define module_name notification
-%{!?_rel:%{expand:%%global _rel 0.enl%{?dist}}}
-
-Summary: %{module_name} module for the Enlightenment window manager
-Name: e_modules-%{module_name}
-Version: @VERSION@
-Release: %{_rel}
-License: BSD
-Group: User Interface/Desktops
-URL: http://www.enlightenment.org/
-Source: ftp://ftp.enlightenment.org/pub/enlightenment/%{module_name}-%{version}.tar.gz
-Packager: %{?_packager:%{_packager}}%{!?_packager:Michael Jennings <mej@eterm.org>}
-Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:The Enlightenment Project (http://www.enlightenment.org/)}
-Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
-BuildRequires: ecore-devel, evas-devel, edje-bin
-BuildRequires: edje-devel, eet-devel, enlightenment-devel >= 0.16.999
-Requires: enlightenment >= 0.16.999
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-
-%description
-%{module_name} module for the Enlightenment window manager.
-
-%prep
-%setup -q -n %{module_name}-%{version}
-
-%build
-%{configure}
-%{__make} %{?_smp_mflags} %{?mflags}
-
-%install
-%{__make} %{?mflags_install} DESTDIR=$RPM_BUILD_ROOT install
-%{find_lang} %{module_name} || true > %{module_name}.lang
-
-%clean
-test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
-
-%post
-/sbin/ldconfig
-
-%postun
-/sbin/ldconfig
-
-%files -f %{module_name}.lang
-%defattr(-, root, root)
-%doc AUTHORS ChangeLog COPYING* INSTALL NEWS README
-%{_libdir}/enlightenment/modules/%{module_name}*
-
-%changelog