patches - see mail.

SVN revision: 37618
This commit is contained in:
Carsten Haitzler 2008-11-14 10:22:57 +00:00
parent 48da41646a
commit a76420657d
2 changed files with 5 additions and 4 deletions

View File

@ -1734,7 +1734,6 @@ e_border_shade(E_Border *bd, E_Direction dir)
bd->need_shape_export = 1;
}
edje_object_signal_emit(bd->bg_object, "e,state,shaded", "e");
edje_object_message_signal_process(bd->bg_object);
e_border_frame_recalc(bd);
ev = calloc(1, sizeof(E_Event_Border_Resize));
ev->border = bd;
@ -1844,7 +1843,6 @@ e_border_unshade(E_Border *bd, E_Direction dir)
bd->need_shape_export = 1;
}
edje_object_signal_emit(bd->bg_object, "e,state,unshaded", "e");
edje_object_message_signal_process(bd->bg_object);
e_border_frame_recalc(bd);
ev = calloc(1, sizeof(E_Event_Border_Resize));
ev->border = bd;

View File

@ -353,7 +353,7 @@ _fso_operator_unmarhsall(DBusMessage *msg)
{
/* We care only about the provider name right now. All the other status
* informations get ingnored for the gadget for now */
const char *provider, *name, *reg_stat;
const char *provider = 0 , *name = 0, *reg_stat = 0;
DBusMessageIter iter, a_iter, s_iter, v_iter;
if (!dbus_message_has_signature(msg, "a{sv}")) return NULL;
@ -380,10 +380,13 @@ _fso_operator_unmarhsall(DBusMessage *msg)
dbus_message_iter_next(&a_iter);
}
if (!reg_stat) return NULL;
if (strcmp(reg_stat, "unregistered") == 0) provider = "No Service";
else if (strcmp(reg_stat, "busy") == 0) provider = "Searching...";
else if (strcmp(reg_stat, "denied") == 0) provider = "SOS only";
if (!provider) return NULL;
return strdup(provider);
}