davemds pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=0d0907ec2a8d854711f6be959ba8c5322424ef88
commit 0d0907ec2a8d854711f6be959ba8c5322424ef88
Author: davemds <d...@gurumeditation.it>
Date: Mon Feb 3 21:37:43 2014 +0100
PackageKit: fixed icon state for newly created gadget.
This fix the case where a new (not the first) gadget is added.
Previously you have to restart e to show the correct state.
---
src/modules/packagekit/e_mod_main.c | 1 +
src/modules/packagekit/e_mod_packagekit.c | 79 ++++++++++++++++++-------------
src/modules/packagekit/e_mod_packagekit.h | 3 +-
3 files changed, 47 insertions(+), 36 deletions(-)
diff --git a/src/modules/packagekit/e_mod_main.c
b/src/modules/packagekit/e_mod_main.c
index c6fae09..10690eb 100644
--- a/src/modules/packagekit/e_mod_main.c
+++ b/src/modules/packagekit/e_mod_main.c
@@ -192,6 +192,7 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id,
const char *style)
evas_object_event_callback_add(inst->gadget, EVAS_CALLBACK_MOUSE_DOWN,
packagekit_mouse_down_cb, inst);
ctxt->instances = eina_list_append(ctxt->instances, inst);
+ packagekit_icon_update(ctxt, EINA_FALSE);
return inst->gcc;
}
diff --git a/src/modules/packagekit/e_mod_packagekit.c
b/src/modules/packagekit/e_mod_packagekit.c
index 9b16fa2..1e7f22a 100644
--- a/src/modules/packagekit/e_mod_packagekit.c
+++ b/src/modules/packagekit/e_mod_packagekit.c
@@ -7,17 +7,52 @@
/* GUI */
void
-packagekit_icon_update(E_PackageKit_Module_Context *ctxt, const char *state,
unsigned num)
+packagekit_icon_update(E_PackageKit_Module_Context *ctxt,
+ Eina_Bool working)
{
E_PackageKit_Instance *inst;
+ E_PackageKit_Package *pkg;
+ unsigned count = 0;
+ const char *state;
char buf[16];
Eina_List *l;
- if (num) snprintf(buf, sizeof(buf), "%d", num);
+ if (working)
+ state = "packagekit,state,working";
+ else if (ctxt->error)
+ state = "packagekit,state,error";
+ else
+ {
+ EINA_LIST_FOREACH(ctxt->packages, l, pkg)
+ {
+ switch (pkg->info)
+ {
+ case PK_INFO_ENUM_LOW:
+ case PK_INFO_ENUM_ENHANCEMENT:
+ case PK_INFO_ENUM_NORMAL:
+ case PK_INFO_ENUM_BUGFIX:
+ case PK_INFO_ENUM_IMPORTANT:
+ case PK_INFO_ENUM_SECURITY:
+ count++;
+ break;
+ default:
+ break;
+ }
+ }
+
+ if (count > 0)
+ state = "packagekit,state,updates";
+ else
+ state = "packagekit,state,updated";
+ }
+
+ DBG("PKGKIT: IconUpdate, %d updates available (%s)", count, state);
+
+ if (count) snprintf(buf, sizeof(buf), "%d", count);
EINA_LIST_FOREACH(ctxt->instances, l, inst)
{
edje_object_signal_emit(inst->gadget, state, "e");
- edje_object_part_text_set(inst->gadget, "num_updates", num ? buf : "");
+ edje_object_part_text_set(inst->gadget, "num_updates", count ? buf :
"");
}
}
@@ -186,14 +221,15 @@ packagekit_popup_del(E_PackageKit_Instance *inst)
static void
_store_error(E_PackageKit_Module_Context *ctxt, const char *err)
{
- ERR("PKGKIT ERROR: %s", err);
- packagekit_icon_update(ctxt, "packagekit,state,error", 0);
+ ERR("PKGKIT: ERROR: %s", err);
if (ctxt->error)
eina_stringshare_replace(&ctxt->error, err);
else
ctxt->error = eina_stringshare_add(err);
+ packagekit_icon_update(ctxt, EINA_FALSE);
}
+
/* RefreshCache() */
static void
null_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending
EINA_UNUSED)
@@ -334,9 +370,6 @@ _signal_finished_cb(void *data, const Eldbus_Message *msg)
{ /* Finished ('u'exit, 'u'runtime) */
const char *error, *error_msg;
E_PackageKit_Module_Context *ctxt = data;
- E_PackageKit_Package *pkg;
- unsigned num_updates = 0;
- Eina_List *l;
if (eldbus_message_error_get(msg, &error, &error_msg))
{
@@ -349,27 +382,8 @@ _signal_finished_cb(void *data, const Eldbus_Message *msg)
E_FREE_FUNC(obj, eldbus_object_unref);
E_FREE_FUNC(ctxt->error, eina_stringshare_del);
- EINA_LIST_FOREACH(ctxt->packages, l, pkg)
- {
- switch (pkg->info)
- {
- case PK_INFO_ENUM_LOW:
- case PK_INFO_ENUM_ENHANCEMENT:
- case PK_INFO_ENUM_NORMAL:
- case PK_INFO_ENUM_BUGFIX:
- case PK_INFO_ENUM_IMPORTANT:
- case PK_INFO_ENUM_SECURITY:
- num_updates++;
- break;
- default:
- break;
- }
- }
- DBG("PKGKIT: PackageFinished, %d updates available", num_updates);
- if (num_updates > 0)
- packagekit_icon_update(ctxt, "packagekit,state,updates", num_updates);
- else
- packagekit_icon_update(ctxt, "packagekit,state,updated", 0);
+ DBG("PKGKIT: PackageFinished");
+ packagekit_icon_update(ctxt, EINA_FALSE);
}
void
@@ -440,9 +454,7 @@
packagekit_create_transaction_and_exec(E_PackageKit_Module_Context *ctxt,
{
Eldbus_Pending *pending;
- DBG("*****************");
- DBG("PKGKIT Version: %d . %d . %d", ctxt->v_maj, ctxt->v_min, ctxt->v_mic);
- DBG("*****************");
+ DBG("PKGKIT: Version: %d.%d.%d", ctxt->v_maj, ctxt->v_min, ctxt->v_mic);
if (ctxt->transaction)
{
@@ -459,8 +471,7 @@
packagekit_create_transaction_and_exec(E_PackageKit_Module_Context *ctxt,
return;
}
eldbus_pending_data_set(pending, "func", func);
-
- packagekit_icon_update(ctxt, "packagekit,state,working", 0);
+ packagekit_icon_update(ctxt, EINA_TRUE);
}
diff --git a/src/modules/packagekit/e_mod_packagekit.h
b/src/modules/packagekit/e_mod_packagekit.h
index 8936444..fc6e71a 100644
--- a/src/modules/packagekit/e_mod_packagekit.h
+++ b/src/modules/packagekit/e_mod_packagekit.h
@@ -93,8 +93,7 @@ void
packagekit_create_transaction_and_exec(E_PackageKit_Module_Context *ct
E_PackageKit_Transaction_Func
func);
void packagekit_get_updates(E_PackageKit_Module_Context *ctxt, const char
*transaction);
void packagekit_refresh_cache(E_PackageKit_Module_Context *ctxt, const
char *transaction);
-
-void packagekit_icon_update(E_PackageKit_Module_Context *ctxt, const char
*state, unsigned num);
+void packagekit_icon_update(E_PackageKit_Module_Context *ctxt, Eina_Bool
working);
void packagekit_popup_new(E_PackageKit_Instance *inst);
void packagekit_popup_del(E_PackageKit_Instance *inst);
void packagekit_popup_update(E_PackageKit_Instance *inst);
--
