delete unused code

devs/bu5hm4n/systray
Marcel Hollerbach 7 years ago
parent da51b1a002
commit 33a4f33410
  1. 109
      src/modules/systray/e_mod_main.c
  2. 32
      src/modules/systray/e_mod_main.h
  3. 1
      src/modules/systray/e_mod_notifier_host_dbus.c
  4. 10
      src/modules/systray/e_mod_notifier_host_private.h

@ -2,11 +2,9 @@
static const char _Name[] = "Systray";
static const char _name[] = "systray";
static const char _group_gadget[] = "e/modules/systray/main";
static const char _sig_source[] = "e";
E_Module *systray_mod = NULL;
static Systray_Context *ctx = NULL;
static char tmpbuf[4096]; /* general purpose buffer, just use immediately */
#define SYSTRAY_MIN_W 16
@ -272,7 +270,6 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED)
systray_notifier_host_shutdown();
free(ctx);
return 1;
}
@ -281,108 +278,4 @@ e_modapi_save(E_Module *m EINA_UNUSED)
{
//e_config_domain_save(_name, ctx->conf_edd, ctx->config);
return 1;
}
E_Gadcon_Orient
systray_orient_get(const Instance *inst)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(inst, E_GADCON_ORIENT_HORIZ);
return inst->gcc->gadcon->orient;
}
const E_Gadcon *
systray_gadcon_get(const Instance *inst)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(inst, NULL);
return inst->gcc->gadcon;
}
E_Gadcon_Client *
systray_gadcon_client_get(const Instance *inst)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(inst, NULL);
return inst->gcc;
}
const char *
systray_style_get(const Instance *inst)
{
const char *style;
EINA_SAFETY_ON_NULL_RETURN_VAL(inst, NULL);
style = inst->gcc->style;
if (!style)
style = "default";
return style;
}
Evas *
systray_evas_get(const Instance *inst)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(inst, NULL);
return inst->evas;
}
Evas_Object *
systray_edje_get(const Instance *inst)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(inst, NULL);
return inst->ui.gadget;
}
const Evas_Object *
systray_box_get(const Instance *inst)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(inst, NULL);
return edje_object_part_object_get(inst->ui.gadget, "box");
}
void
systray_edje_box_append(const Instance *inst, Evas_Object *child)
{
edje_object_part_box_append(inst->ui.gadget, "box", child);
}
void
systray_edje_box_prepend(const Instance *inst, Evas_Object *child)
{
edje_object_part_box_prepend(inst->ui.gadget, "box", child);
}
void
systray_edje_box_remove(const Instance *inst, Evas_Object *child)
{
edje_object_part_box_remove(inst->ui.gadget, "box", child);
}
static void
_systray_size_apply_do(Instance *inst)
{
Evas_Coord w, h;
edje_object_message_signal_process(inst->ui.gadget);
edje_object_size_min_calc(inst->ui.gadget, &w, &h);
e_gadcon_client_min_size_set(inst->gcc, MAX(w, SYSTRAY_MIN_W), MAX(h, SYSTRAY_MIN_H));
}
static void
_systray_size_apply_delayed(void *data)
{
Instance *inst = data;
_systray_size_apply_do(inst);
inst->job.size_apply = NULL;
}
void
systray_size_updated(Instance *inst)
{
EINA_SAFETY_ON_NULL_RETURN(inst);
if (inst->job.size_apply) return;
inst->job.size_apply = ecore_job_add(_systray_size_apply_delayed, inst);
}
EINTERN Systray_Context *
systray_ctx_get(void)
{
return ctx;
}
}

@ -13,19 +13,6 @@ typedef struct _Instance Instance;
typedef struct _Context_Notifier_Host Context_Notifier_Host;
typedef struct _Instance_Notifier_Host Instance_Notifier_Host;
typedef struct _Notifier_Item Notifier_Item;
typedef struct _Systray_Context Systray_Context;
typedef struct Systray_Config Systray_Config;
struct _E_Config_Dialog_Data
{
};
struct _Systray_Context
{
Systray_Config *config;
E_Config_DD *conf_edd;
E_Config_DD *notifier_item_edd;
};
struct _Instance
{
@ -42,30 +29,11 @@ struct _Instance
} job;
};
typedef struct Notifier_Item_Cache
{
Eina_Stringshare *path;
} Notifier_Item_Cache;
struct Systray_Config
{
Eina_Stringshare *dbus;
Eina_Hash *items;
};
E_Gadcon_Orient systray_orient_get(const Instance *inst);
const E_Gadcon *systray_gadcon_get(const Instance *inst);
E_Gadcon_Client *systray_gadcon_client_get(const Instance *inst);
const char *systray_style_get(const Instance *inst);
void systray_size_updated(Instance *inst);
Evas *systray_evas_get(const Instance *inst);
void systray_notifier_host_init(void);
void systray_notifier_host_shutdown(void);
Evas_Object* systray_notifier_host_new(const char *shelfstyle, const char *style);
EINTERN Systray_Context *systray_ctx_get(void);
extern E_Module *systray_mod;
/**
* @addtogroup Optional_Gadgets

@ -346,7 +346,6 @@ static void
notifier_item_add(const char *path, const char *bus_id, Context_Notifier_Host *ctx)
{
Eldbus_Proxy *proxy;
Notifier_Item_Cache *nic;
Notifier_Item *item = calloc(1, sizeof(Notifier_Item));
Eldbus_Signal_Handler *s;
EINA_SAFETY_ON_NULL_RETURN(item);

@ -14,13 +14,6 @@ typedef enum {
STATUS_LAST
} Tray_Status;
typedef struct _Notifier_Data
{
EINA_INLIST;
Notifier_Item *item;
Evas_Object *icon;
} Notifier_Item_Icon;
struct _Instance_Notifier_Host
{
EINA_INLIST;
@ -64,9 +57,6 @@ struct _Notifier_Item
Eina_List *icons; //list of icons which gets updated
};
typedef void (*E_Notifier_Watcher_Item_Registered_Cb)(void *data, const char *service, const char *path);
typedef void (*E_Notifier_Watcher_Item_Unregistered_Cb)(void *data, const char *service, const char *path);
void _hack_get_me_the_correct_min_size(Edje_Object *obj);
void systray_notifier_update_menu(void *data, E_DBusMenu_Item *new_root_item);

Loading…
Cancel
Save