DeforaOS/Panel
DeforaOS/Panel
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Match the new MimeHandler API

Browse Source
This commit is contained in:
Pierre Pronchery 2017-12-28 03:47:49 +01:00
parent 5ea3e4fd3c
commit 1eb2258358
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/applets/menu.c
View File

@ -234,11 +234,11 @@ static GtkWidget * _menu_applications(Menu * menu)
{
handler = p->data;
/* should not fail */
name = mimehandler_get_name(handler);
name = mimehandler_get_name(handler, 1);
#if GTK_CHECK_VERSION(2, 12, 0)
comment = mimehandler_get_comment(handler);
comment = mimehandler_get_comment(handler, 1);
#endif
if((q = mimehandler_get_generic_name(handler)) != NULL)
if((q = mimehandler_get_generic_name(handler, 1)) != NULL)
{
#if GTK_CHECK_VERSION(2, 12, 0)
if(comment == NULL)
@ -248,7 +248,7 @@ static GtkWidget * _menu_applications(Menu * menu)
}
filename = mimehandler_get_filename(handler);
menuitem = _menu_menuitem(menu, filename, name,
mimehandler_get_icon(handler));
mimehandler_get_icon(handler, 1));
#if GTK_CHECK_VERSION(2, 12, 0)
if(comment != NULL)
gtk_widget_set_tooltip_text(menuitem, comment);
@ -628,10 +628,10 @@ static gint _idle_apps_compare(gconstpointer a, gconstpointer b)
String const * mhas;
String const * mhbs;
if((mhas = mimehandler_get_generic_name(mha)) == NULL)
mhas = mimehandler_get_name(mha);
if((mhbs = mimehandler_get_generic_name(mhb)) == NULL)
mhbs = mimehandler_get_name(mhb);
if((mhas = mimehandler_get_generic_name(mha, 1)) == NULL)
mhas = mimehandler_get_name(mha, 1);
if((mhbs = mimehandler_get_generic_name(mhb, 1)) == NULL)
mhbs = mimehandler_get_name(mhb, 1);
return string_compare(mhas, mhbs);
}