- fix menu to be more intuitive. took me a while to figure out how to add feeds to a gadget

- remove deprecated e_util_edje_icon_get
- fix warnings


SVN revision: 57100

src/news_feed.c

@@ -29,8 +29,8 @@ static Eina_Bool        _cb_feed_server_del(void *data, int type, void *event);
 static Eina_Bool        _cb_feed_server_data(void *data, int type, void *event);
 static void       _cb_feed_parse(News_Feed_Document *doc, News_Parse_Error error, int changes);
 static Eina_Bool        _cb_feeds_timer(void *data);
-static int        _cb_sort_cats(void *d1, void *d2);
-static int        _cb_sort_feeds(void *d1, void *d2);
+static int        _cb_sort_cats(const void *d1, const void *d2);
+static int        _cb_sort_feeds(const void *d1, const void *d2);
 
 static const News_Feed_Lang _feed_langs[] = {
    {"ca", "Catalan"},
@@ -1363,9 +1363,9 @@ _cb_feeds_timer(void *data)
 }
 
 static int
-_cb_sort_cats(void *d1, void *d2)
+_cb_sort_cats(const void *d1, const void *d2)
 {
-   News_Feed_Category *c1, *c2;
+   const News_Feed_Category *c1, *c2;
 
    c1 = d1;
    c2 = d2;
@@ -1374,9 +1374,9 @@ _cb_sort_cats(void *d1, void *d2)
 }
 
 static int
-_cb_sort_feeds(void *d1, void *d2)
+_cb_sort_feeds(const void *d1, const void *d2)
 {
-   News_Feed *f1, *f2;
+   const News_Feed *f1, *f2;
 
    f1 = d1;
    f2 = d2;

src/news_menu.c

@@ -121,60 +121,53 @@ _menu_append(E_Menu *ma, News_Item *ni)
    E_Menu *mg, *mn;
    E_Menu_Item *mi;
 
-   mn = e_menu_new();
-
    if (ni->config->feed_refs)
      {
         if (ni->unread_count)
           {
-             mi = e_menu_item_new(mn);
+             mi = e_menu_item_new(ma);
              e_menu_item_label_set(mi, D_("Set all as read"));
              news_theme_menu_icon_set(mi, NEWS_THEME_ICON_SETASREAD);
              e_menu_item_callback_set(mi, _cb_item_setasread, ni);
           }
 
-        mi = e_menu_item_new(mn);
+        mi = e_menu_item_new(ma);
         e_menu_item_label_set(mi, D_("Update"));
         news_theme_menu_icon_set(mi, NEWS_THEME_ICON_UPDATE);
         e_menu_item_callback_set(mi, _cb_item_update, ni);
-
-		mi = e_menu_item_new(mn);
-        e_menu_item_separator_set(mi, 1);
      }
 
-   mi = e_menu_item_new(mn);
-   e_menu_item_label_set(mi, D_("Settings"));
-   news_theme_menu_icon_set(mi, "icon");
-   e_menu_item_callback_set(mi, _cb_configure_feeds, NULL);
-
    mi = e_menu_item_new(ma);
-   e_menu_item_label_set(mi, D_("Newsfeeds"));
-   e_util_menu_item_theme_icon_set(mi, "preferences-system");
-   e_menu_item_submenu_set(mi, mn);
-
-   mg = e_menu_new();
-
-   mi = e_menu_item_new(mg);
-   e_menu_item_label_set(mi, D_("Contents"));
+   e_menu_item_label_set(mi, D_("Gadget Contents"));
    news_theme_menu_icon_set(mi, "icon");
    e_menu_item_callback_set(mi, _cb_configure_item_content, ni);
 
+   mi = e_menu_item_new(ma);
+   e_menu_item_separator_set(mi, 1);
+
    mn = e_menu_new();
 
    mi = e_menu_item_new(mn);
    e_menu_item_label_set(mi, D_("Gadget"));
    e_util_menu_item_theme_icon_set(mi, "preferences-system");
    e_menu_item_callback_set(mi, _cb_configure_item, ni);
+
+   mi = e_menu_item_new(mn);
+   e_menu_item_label_set(mi, D_("Feeds"));
+   news_theme_menu_icon_set(mi, "icon");
+   e_menu_item_callback_set(mi, _cb_configure_feeds, NULL);
+
    mi = e_menu_item_new(mn);
    e_menu_item_label_set(mi, D_("Main"));
    e_util_menu_item_theme_icon_set(mi, "preferences-system");
    e_menu_item_callback_set(mi, _cb_configure_main, NULL);
 
-   mi = e_menu_item_new(mg);
+   mi = e_menu_item_new(ma);
    e_menu_item_label_set(mi, D_("Settings"));
    e_util_menu_item_theme_icon_set(mi, "preferences-system");
    e_menu_item_submenu_set(mi, mn);
 
+   mg = e_menu_new();
    e_gadcon_client_util_menu_items_append(ni->gcc, ma, mg, 0);
 }
 

src/news_theme.c

@@ -32,7 +32,7 @@ news_theme_icon_set(Evas_Object *ic, char *key)
 void
 news_theme_menu_icon_set(E_Menu_Item *mi, char *key)
 {
-   if (!e_util_menu_item_edje_icon_set(mi, key))
+   if (!e_util_menu_item_theme_icon_set(mi, key))
      e_menu_item_icon_edje_set(mi, news_theme_file_get(NULL), key);
 }
 

src/news_utils.c

@@ -27,7 +27,7 @@ news_util_ecanvas_geometry_get(int *canvas_w, int *canvas_h)
 }
 
 int
-news_util_datecmp(struct tm *t1, struct tm *t2)
+news_util_datecmp(const struct tm *t1, const struct tm *t2)
 {
    if (t1->tm_year != t2->tm_year)
      return (t1->tm_year - t2->tm_year);

src/news_utils.h

@@ -31,7 +31,7 @@ int         news_util_url_image_get(char *url, void (*func_cb) (News_Feed_Docume
 int         news_util_ecanvas_geometry_get(int *canvas_w, int *canvas_h);
 const char *news_util_convert_locale_to_utf8(char *txt);
 const char *news_util_convert_utf8_to_locale(char *txt);
-int         news_util_datecmp(struct tm *t1, struct tm *t2);
+int         news_util_datecmp(const struct tm *t1, const struct tm *t2);
 int         news_util_browser_open(const char *url);
 Eina_List  *news_util_lang_detect(void);
 int         news_util_proxy_detect(void);

src/news_viewer.c

@@ -31,7 +31,7 @@ static Eina_List   *_sort_feedrefs_unreadfirst_list_get(News_Item *ni);
 static Eina_List   *_sort_articles_unreadfirst_list_get(News_Feed *f);
 static Eina_List   *_sort_articles_unreadfirst(Eina_List *articles);
 static Eina_List   *_sort_articles_date_list_get(News_Feed *f);
-static int          _sort_articles_date_list_cb(void *d1, void *d2);
+static int          _sort_articles_date_list_cb(const void *d1, const void *d2);
 
 static Eina_List *_viewers;
 
@@ -1014,9 +1014,9 @@ _sort_articles_date_list_get(News_Feed *f)
 }
 
 static int
-_sort_articles_date_list_cb(void *d1, void *d2)
+_sort_articles_date_list_cb(const void *d1, const void *d2)
 {
-   News_Feed_Article *a1, *a2;
+   const News_Feed_Article *a1, *a2;
 
    a1 = d1;
    a2 = d2;