callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Coding style and whitespace cleanup.

Browse Source
This commit is contained in:
Matthew Barnes
2011-08-16 11:25:56 -04:00
parent f78417c488
commit fcbbdfbd18
521 changed files with 16778 additions and 11489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
shell/e-shell-meego.c
View File

@ -54,9 +54,9 @@ e_shell_detect_meego (gboolean *is_meego,
*/
struct {
gint (*XFree) (gpointer);
gint (*XGetWindowProperty) (Display*, XID, Atom, long, long, Bool,
Atom, Atom *, gint *, unsigned long*,
unsigned long*, guchar **);
gint (*XGetWindowProperty) (Display *, XID, Atom, long, long, Bool,
Atom, Atom *, gint *, gulong *,
gulong *, guchar **);
} fns = { 0, 0 };
*is_meego = *small_screen = FALSE;
@ -67,7 +67,7 @@ e_shell_detect_meego (gboolean *is_meego,
GdkDisplay *display;
GdkAtom wm_win, mob_atom;
Atom dummy_t;
unsigned long dummy_l;
gulong dummy_l;
gint dummy_i;
if (!gdk_display_get_default ())

7
shell/e-shell-migrate.c
View File

@ -798,7 +798,8 @@ fix_folder_permissions (const gchar *data_dir)
}
static void
merge_duplicate_local_sources (GConfClient *client, const gchar *gconf_key)
merge_duplicate_local_sources (GConfClient *client,
const gchar *gconf_key)
{
ESourceList *source_list;
GSList *iter, *to_remove = NULL;
@ -933,12 +934,12 @@ e_shell_migrate_attempt (EShell *shell)
fix_folder_permissions (e_get_user_data_dir ());
/* Attempt to run migration all the time and let the backend
make the choice */
* make the choice */
if (!shell_migrate_attempt (shell, major, minor, micro))
_exit (EXIT_SUCCESS);
/* The 2.32.x (except of 2.32.2) lefts duplicate On This Computer/Personal sources,
thus clean the mess up */
* thus clean the mess up */
merge_duplicate_local_sources (client, "/apps/evolution/addressbook/sources");
merge_duplicate_local_sources (client, "/apps/evolution/calendar/sources");
merge_duplicate_local_sources (client, "/apps/evolution/tasks/sources");

18
shell/e-shell-switcher.c
View File

@ -248,8 +248,8 @@ shell_switcher_dispose (GObject *object)
static void
shell_switcher_get_preferred_width (GtkWidget *widget,
gint *minimum,
gint *natural)
gint *minimum,
gint *natural)
{
EShellSwitcherPrivate *priv;
GtkWidget *child;
@ -283,8 +283,8 @@ shell_switcher_get_preferred_width (GtkWidget *widget,
static void
shell_switcher_get_preferred_height (GtkWidget *widget,
gint *minimum,
gint *natural)
gint *minimum,
gint *natural)
{
EShellSwitcherPrivate *priv;
GtkWidget *child;
@ -601,9 +601,9 @@ tool_item_get_button (GtkWidget *widget)
}
static gboolean
tool_item_button_cb (GtkWidget *internal_widget,
GdkEventButton *event,
GtkAction *action)
tool_item_button_cb (GtkWidget *internal_widget,
GdkEventButton *event,
GtkAction *action)
{
g_return_val_if_fail (GTK_IS_ACTION (action), FALSE);
@ -629,8 +629,8 @@ tool_item_button_cb (GtkWidget *internal_widget,
**/
void
e_shell_switcher_add_action (EShellSwitcher *switcher,
GtkAction *switch_action,
GtkAction *new_window_action)
GtkAction *switch_action,
GtkAction *new_window_action)
{
GtkWidget *widget;
GtkButton *button;

2
shell/e-shell-utils.c
View File

@ -160,7 +160,7 @@ GFile *
e_shell_run_save_dialog (EShell *shell,
const gchar *title,
const gchar *suggestion,
const gchar *filters,
const gchar *filters,
GtkCallback customize_func,
gpointer customize_data)
{

3
shell/e-shell-view.c
View File

@ -247,7 +247,8 @@ shell_view_save_state_done_cb (GFile *file,
}
static EActivity *
shell_view_save_state (EShellView *shell_view, gboolean immediately)
shell_view_save_state (EShellView *shell_view,
gboolean immediately)
{
EShellBackend *shell_backend;
SaveStateData *data;

58
shell/e-shell-window-actions.c
View File

@ -1255,7 +1255,7 @@ action_switcher_cb (GtkRadioAction *action,
static void
action_new_view_window_cb (GtkAction *action,
EShellWindow *shell_window)
EShellWindow *shell_window)
{
EShell *shell;
const gchar *view_name;
@ -2097,20 +2097,25 @@ e_shell_window_create_new_menu (EShellWindow *shell_window)
}
static GtkAction *
e_shell_window_create_switcher_action (GType type, EShellViewClass *class,
const gchar *name, const gchar *tooltip,
const gchar *view_name)
e_shell_window_create_switcher_action (GType type,
EShellViewClass *class,
const gchar *name,
const gchar *tooltip,
const gchar *view_name)
{
GtkAction *action;
action = g_object_new (type, "name", name,
"label", class->label,
"tooltip", tooltip,
"icon-name", class->icon_name,
NULL);
action = g_object_new (
type,
"name", name,
"label", class->label,
"tooltip", tooltip,
"icon-name", class->icon_name,
NULL);
g_object_set_data (G_OBJECT (action), "view-name",
(gpointer) view_name);
g_object_set_data (
G_OBJECT (action),
"view-name", (gpointer) view_name);
return action;
}
@ -2188,17 +2193,19 @@ e_shell_window_create_switcher_actions (EShellWindow *shell_window)
tooltip = g_strdup_printf (_("Switch to %s"), class->label);
s_action_name = g_strdup_printf (E_SHELL_SWITCHER_FORMAT, view_name);
s_action_name = g_strdup_printf (
E_SHELL_SWITCHER_FORMAT, view_name);
/* Note, we have to set "icon-name" separately because
* gtk_radio_action_new() expects a "stock-id". Sadly,
* GTK+ still distinguishes between the two. */
s_action = GTK_RADIO_ACTION (
e_shell_window_create_switcher_action (GTK_TYPE_RADIO_ACTION,
class, s_action_name,
tooltip, view_name));
g_object_set (G_OBJECT (s_action), "value", ii++, NULL);
e_shell_window_create_switcher_action (
GTK_TYPE_RADIO_ACTION,
class, s_action_name,
tooltip, view_name));
g_object_set (s_action, "value", ii++, NULL);
gtk_radio_action_set_group (s_action, group);
group = gtk_radio_action_get_group (s_action);
@ -2221,16 +2228,19 @@ e_shell_window_create_switcher_actions (EShellWindow *shell_window)
g_free (s_action_name);
/* Create in new window actions */
n_action_name = g_strdup_printf (E_SHELL_NEW_WINDOW_FORMAT, view_name);
n_action = e_shell_window_create_switcher_action (GTK_TYPE_ACTION,
class, n_action_name,
tooltip, view_name);
g_signal_connect (G_OBJECT (n_action), "activate",
G_CALLBACK (action_new_view_window_cb),
shell_window);
n_action_name = g_strdup_printf (
E_SHELL_NEW_WINDOW_FORMAT, view_name);
n_action = e_shell_window_create_switcher_action (
GTK_TYPE_ACTION,
class, n_action_name,
tooltip, view_name);
g_signal_connect (
n_action, "activate",
G_CALLBACK (action_new_view_window_cb), shell_window);
gtk_action_group_add_action (n_action_group, n_action);
e_shell_switcher_add_action (switcher, GTK_ACTION (s_action), n_action);
e_shell_switcher_add_action (
switcher, GTK_ACTION (s_action), n_action);
g_free (n_action_name);
g_free (tooltip);

8
shell/e-shell-window.c
View File

@ -190,8 +190,8 @@ shell_window_set_shell (EShellWindow *shell_window,
static void
shell_window_set_property (GObject *object,
guint property_id,
const GValue *value,
GParamSpec *pspec)
const GValue *value,
GParamSpec *pspec)
{
switch (property_id) {
case PROP_ACTIVE_VIEW:
@ -249,8 +249,8 @@ shell_window_set_property (GObject *object,
static void
shell_window_get_property (GObject *object,
guint property_id,
GValue *value,
GParamSpec *pspec)
GValue *value,
GParamSpec *pspec)
{
switch (property_id) {
case PROP_ACTIVE_VIEW:

11
shell/es-event.c
View File

@ -88,7 +88,10 @@ ESEvent *es_event_peek (void)
}
ESEventTargetUpgrade *
es_event_target_new_upgrade (ESEvent *eme, gint major, gint minor, gint revision)
es_event_target_new_upgrade (ESEvent *eme,
gint major,
gint minor,
gint revision)
{
ESEventTargetUpgrade *t;
@ -112,7 +115,7 @@ static const EEventHookTargetMap emeh_targets[] = {
};
static void
emeh_finalise (GObject *o)
emeh_finalize (GObject *o)
{
/*EPluginHook *eph = (EPluginHook *)o;*/
@ -131,10 +134,10 @@ emeh_class_init (EPluginHookClass *class)
* A hook for events coming from the shell.
**/
((GObjectClass *) class)->finalize = emeh_finalise;
((GObjectClass *) class)->finalize = emeh_finalize;
((EPluginHookClass *)class)->id = "org.gnome.evolution.shell.events:1.0";
for (i=0;emeh_targets[i].type;i++)
for (i = 0; emeh_targets[i].type; i++)
e_event_hook_class_add_target_map (
(EEventHookClass *) class, &emeh_targets[i]);

3
shell/killev.c
View File

@ -107,7 +107,8 @@ kill_factories (void)
}
gint
main (gint argc, gchar **argv)
main (gint argc,
gchar **argv)
{
GFile *pid_file;
GFileMonitor *monitor;

3
shell/main.c
View File

@ -431,7 +431,8 @@ create_default_shell (void)
}
gint
main (gint argc, gchar **argv)
main (gint argc,
gchar **argv)
{
EShell *shell;
GConfClient *client;