nagbalae/dunst
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix glib assertion warnings

Browse Source
This commit is contained in:
Sascha Kruse 2013-02-19 01:30:38 +00:00
parent 6169a8e676
commit e15d918a3c
1 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
dunst_dbus.c
View File

@ -146,33 +146,48 @@ static void onNotify(GDBusConnection *connection,
switch (idx) { switch (idx) {
case 0: case 0:
appname = g_variant_dup_string(content, NULL); if (g_variant_is_of_type(content, G_VARIANT_TYPE_STRING))
appname = g_variant_dup_string(content, NULL);
break; break;
case 1: case 1:
replaces_id = g_variant_get_uint32(content); if (g_variant_is_of_type(content, G_VARIANT_TYPE_UINT32))
replaces_id = g_variant_get_uint32(content);
break; break;
case 2: case 2:
icon = g_variant_dup_string(content, NULL); if (g_variant_is_of_type(content, G_VARIANT_TYPE_STRING))
icon = g_variant_dup_string(content, NULL);
break; break;
case 3: case 3:
summary = g_variant_dup_string(content, NULL); if (g_variant_is_of_type(content, G_VARIANT_TYPE_STRING))
summary = g_variant_dup_string(content, NULL);
break; break;
case 4: case 4:
body = g_variant_dup_string(content, NULL); if (g_variant_is_of_type(content, G_VARIANT_TYPE_STRING))
body = g_variant_dup_string(content, NULL);
break; break;
case 5: case 5:
actions->actions = g_variant_dup_strv(content, &(actions->count)); if (g_variant_is_of_type(content, G_VARIANT_TYPE_STRING_ARRAY))
actions->actions = g_variant_dup_strv(content, &(actions->count));
break; break;
case 6: case 6:
dict_value = g_variant_lookup_value(content, "urgency", G_VARIANT_TYPE_BYTE); if (g_variant_is_of_type(content, G_VARIANT_TYPE_DICTIONARY)) {
urgency = g_variant_get_byte(dict_value);
dict_value = g_variant_lookup_value(content, "fgcolor", G_VARIANT_TYPE_STRING); dict_value = g_variant_lookup_value(content, "urgency", G_VARIANT_TYPE_BYTE);
fgcolor = g_variant_dup_string(dict_value, NULL); if (dict_value)
dict_value = g_variant_lookup_value(content, "bgcolor", G_VARIANT_TYPE_STRING); urgency = g_variant_get_byte(dict_value);
bgcolor = g_variant_dup_string(dict_value, NULL);
dict_value = g_variant_lookup_value(content, "fgcolor", G_VARIANT_TYPE_STRING);
if (dict_value)
fgcolor = g_variant_dup_string(dict_value, NULL);
dict_value = g_variant_lookup_value(content, "bgcolor", G_VARIANT_TYPE_STRING);
if(dict_value)
bgcolor = g_variant_dup_string(dict_value, NULL);
}
break; break;
case 7: case 7:
timeout = g_variant_get_int32(content); if (g_variant_is_of_type(content, G_VARIANT_TYPE_INT32))
timeout = g_variant_get_int32(content);
break; break;
} }
@ -221,7 +236,6 @@ static void onNotify(GDBusConnection *connection,
g_dbus_method_invocation_return_value(invocation, reply); g_dbus_method_invocation_return_value(invocation, reply);
g_dbus_connection_flush(connection, NULL, NULL, NULL); g_dbus_connection_flush(connection, NULL, NULL, NULL);
g_variant_unref(reply);
run(NULL); run(NULL);
} }
@ -252,6 +266,11 @@ static void onGetServerInformation(GDBusConnection *connection,
void notificationClosed(notification * n, int reason) void notificationClosed(notification * n, int reason)
{ {
if (!dbus_conn) {
printf("DEBUG: notificationClosed but not (yet) connected\n");
return;
}
GVariant *body = g_variant_new ("(uu)", n->id, reason); GVariant *body = g_variant_new ("(uu)", n->id, reason);
GError *err = NULL; GError *err = NULL;