Formatting & whitespace removal.

No need to call all these _inits() as E already handles init'n those.
Don't need the extra headers included here either as they are already
included via e.h.



SVN revision: 45268
This commit is contained in:
Christopher Michael 2010-01-17 20:21:42 +00:00
parent 205308dd9f
commit 8d1f4a54af
4 changed files with 89 additions and 122 deletions

View File

@ -1,6 +1,5 @@
#include "e.h" #include "e.h"
/***************************************************************************/
typedef struct _Instance Instance; typedef struct _Instance Instance;
struct _Instance struct _Instance
@ -11,8 +10,6 @@ struct _Instance
int on; int on;
}; };
/***************************************************************************/
/**/
/* gadcon requirements */ /* gadcon requirements */
static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style); static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
static void _gc_shutdown(E_Gadcon_Client *gcc); static void _gc_shutdown(E_Gadcon_Client *gcc);
@ -32,8 +29,6 @@ static const E_Gadcon_Client_Class _gadcon_class =
E_GADCON_CLIENT_STYLE_PLAIN E_GADCON_CLIENT_STYLE_PLAIN
}; };
static E_Module *mod = NULL; static E_Module *mod = NULL;
/**/
/***************************************************************************/
static int _cb_poll(void *data); static int _cb_poll(void *data);

View File

@ -1,10 +1,5 @@
#include "e.h" #include "e.h"
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
static E_DBus_Connection *conn = NULL; static E_DBus_Connection *conn = NULL;
static E_DBus_Connection *conn_system = NULL; static E_DBus_Connection *conn_system = NULL;
static E_DBus_Signal_Handler *changed_h = NULL; static E_DBus_Signal_Handler *changed_h = NULL;
@ -25,7 +20,6 @@ typedef enum _Phone_Sys
static Phone_Sys detected_system = PH_SYS_UNKNOWN; static Phone_Sys detected_system = PH_SYS_UNKNOWN;
/***************************************************************************/
typedef struct _Instance Instance; typedef struct _Instance Instance;
struct _Instance struct _Instance
@ -36,8 +30,6 @@ struct _Instance
char *oper; char *oper;
}; };
/***************************************************************************/
/**/
/* gadcon requirements */ /* gadcon requirements */
static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style); static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
static void _gc_shutdown(E_Gadcon_Client *gcc); static void _gc_shutdown(E_Gadcon_Client *gcc);
@ -57,8 +49,6 @@ static const E_Gadcon_Client_Class _gadcon_class =
E_GADCON_CLIENT_STYLE_PLAIN E_GADCON_CLIENT_STYLE_PLAIN
}; };
static E_Module *mod = NULL; static E_Module *mod = NULL;
/**/
/***************************************************************************/
static int try_again(void *data); static int try_again(void *data);
static void *signal_unmarhsall(DBusMessage *msg, DBusError *err); static void *signal_unmarhsall(DBusMessage *msg, DBusError *err);
@ -144,10 +134,6 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
inst->strength = -1; inst->strength = -1;
inst->oper = NULL; inst->oper = NULL;
ecore_init();
ecore_string_init();
e_dbus_init();
conn = e_dbus_bus_get(DBUS_BUS_SESSION); conn = e_dbus_bus_get(DBUS_BUS_SESSION);
conn_system = e_dbus_bus_get(DBUS_BUS_SYSTEM); conn_system = e_dbus_bus_get(DBUS_BUS_SYSTEM);
@ -206,9 +192,6 @@ _gc_shutdown(E_Gadcon_Client *gcc)
if (conn) e_dbus_connection_close(conn); if (conn) e_dbus_connection_close(conn);
if (conn_system) e_dbus_connection_close(conn_system); if (conn_system) e_dbus_connection_close(conn_system);
e_dbus_shutdown();
ecore_string_shutdown();
ecore_shutdown();
inst = gcc->data; inst = gcc->data;
evas_object_del(inst->obj); evas_object_del(inst->obj);
@ -631,6 +614,7 @@ static void
fso_operator_changed(void *data, DBusMessage *msg) fso_operator_changed(void *data, DBusMessage *msg)
{ {
char *provider; char *provider;
provider = _fso_operator_unmarhsall(msg); provider = _fso_operator_unmarhsall(msg);
update_operator(provider, data); update_operator(provider, data);
} }

View File

@ -1,6 +1,5 @@
#include "e.h" #include "e.h"
/***************************************************************************/
typedef struct _Instance Instance; typedef struct _Instance Instance;
struct _Instance struct _Instance
@ -11,8 +10,6 @@ struct _Instance
int on; int on;
}; };
/***************************************************************************/
/**/
/* gadcon requirements */ /* gadcon requirements */
static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style); static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
static void _gc_shutdown(E_Gadcon_Client *gcc); static void _gc_shutdown(E_Gadcon_Client *gcc);
@ -32,8 +29,6 @@ static const E_Gadcon_Client_Class _gadcon_class =
E_GADCON_CLIENT_STYLE_PLAIN E_GADCON_CLIENT_STYLE_PLAIN
}; };
static E_Module *mod = NULL; static E_Module *mod = NULL;
/**/
/***************************************************************************/
static int _cb_poll(void *data); static int _cb_poll(void *data);

View File

@ -452,10 +452,7 @@ _e_mod_layout_post_border_assign(E_Border *bd, int not_new)
} }
else if (isdialog) else if (isdialog)
{ {
if (dockwin) if (dockwin) wh -= dockwin->h;
{
wh -= dockwin->h;
}
// if (ww > (bd->client.icccm.min_w + bd->client_inset.l + bd->client_inset.r)) // if (ww > (bd->client.icccm.min_w + bd->client_inset.l + bd->client_inset.r))
// ww = bd->client.icccm.min_w + bd->client_inset.l + bd->client_inset.r; // ww = bd->client.icccm.min_w + bd->client_inset.l + bd->client_inset.r;
bd->w = ww; bd->w = ww;
@ -477,10 +474,8 @@ _e_mod_layout_post_border_assign(E_Border *bd, int not_new)
// if (bd->client.icccm.min_h > (wh - bd->client_inset.t - bd->client_inset.b)) // if (bd->client.icccm.min_h > (wh - bd->client_inset.t - bd->client_inset.b))
// bd->client.icccm.min_h = wh - bd->client_inset.t - bd->client_inset.b; // bd->client.icccm.min_h = wh - bd->client_inset.t - bd->client_inset.b;
if (bd->new_client) if (bd->new_client)
{
_e_mod_layout_effect_slide_in(bd, (double)illume_cfg->sliding.layout.duration / 1000.0, POST_NONE); _e_mod_layout_effect_slide_in(bd, (double)illume_cfg->sliding.layout.duration / 1000.0, POST_NONE);
} }
}
else else
{ {
if ((dockwin) && (dockwin->client.qtopia.soft_menu) && if ((dockwin) && (dockwin->client.qtopia.soft_menu) &&
@ -489,10 +484,8 @@ _e_mod_layout_post_border_assign(E_Border *bd, int not_new)
wh -= dockwin->h; wh -= dockwin->h;
} }
if (bd->new_client) if (bd->new_client)
{
_e_mod_layout_effect_slide_in(bd, (double)illume_cfg->sliding.layout.duration / 1000.0, POST_NONE); _e_mod_layout_effect_slide_in(bd, (double)illume_cfg->sliding.layout.duration / 1000.0, POST_NONE);
} }
}
if (bd == dockwin) if (bd == dockwin)
{ {