diff options
| -rw-r--r-- | baobab/src/baobab-remote-connect-dialog.c | 1 | ||||
| -rw-r--r-- | gsearchtool/libeggsmclient/eggsmclient-private.h | 8 | ||||
| -rw-r--r-- | gsearchtool/libeggsmclient/eggsmclient-xsmp.c | 2 | ||||
| -rw-r--r-- | gsearchtool/libeggsmclient/eggsmclient.c | 8 | ||||
| -rw-r--r-- | logview/src/logview-findbar.c | 2 | ||||
| -rw-r--r-- | mate-dictionary/libgdict/gdict-strategy-chooser.c | 2 | ||||
| -rw-r--r-- | mate-screenshot/src/screenshot-utils.c | 8 |
7 files changed, 15 insertions, 16 deletions
diff --git a/baobab/src/baobab-remote-connect-dialog.c b/baobab/src/baobab-remote-connect-dialog.c index a8db624f..e8eed953 100644 --- a/baobab/src/baobab-remote-connect-dialog.c +++ b/baobab/src/baobab-remote-connect-dialog.c @@ -921,7 +921,6 @@ baobab_remote_connect_dialog_init (BaobabRemoteConnectDialog *dialog) table, TRUE, TRUE, 0); #endif - //dialog->details->uri_entry = caja_location_entry_new (); dialog->details->uri_entry = gtk_entry_new(); dialog->details->server_entry = gtk_entry_new (); dialog->details->share_entry = gtk_entry_new (); diff --git a/gsearchtool/libeggsmclient/eggsmclient-private.h b/gsearchtool/libeggsmclient/eggsmclient-private.h index a79f05df..1313855b 100644 --- a/gsearchtool/libeggsmclient/eggsmclient-private.h +++ b/gsearchtool/libeggsmclient/eggsmclient-private.h @@ -34,14 +34,14 @@ void egg_sm_client_quit_cancelled (EggSMClient *client); void egg_sm_client_quit (EggSMClient *client); #if defined (GDK_WINDOWING_X11) -# ifdef EGG_SM_CLIENT_BACKEND_XSMP +#ifdef EGG_SM_CLIENT_BACKEND_XSMP GType egg_sm_client_xsmp_get_type (void); EggSMClient *egg_sm_client_xsmp_new (void); -# endif -# ifdef EGG_SM_CLIENT_BACKEND_DBUS +#endif +#ifdef EGG_SM_CLIENT_BACKEND_DBUS GType egg_sm_client_dbus_get_type (void); EggSMClient *egg_sm_client_dbus_new (void); -# endif +#endif #endif G_END_DECLS diff --git a/gsearchtool/libeggsmclient/eggsmclient-xsmp.c b/gsearchtool/libeggsmclient/eggsmclient-xsmp.c index 2121ae85..4dbb3ad2 100644 --- a/gsearchtool/libeggsmclient/eggsmclient-xsmp.c +++ b/gsearchtool/libeggsmclient/eggsmclient-xsmp.c @@ -567,7 +567,7 @@ idle_do_pending_events (gpointer data) do_save_yourself (xsmp); } - out: +out: #if !GTK_CHECK_VERSION (3, 0, 0) gdk_threads_leave (); #endif diff --git a/gsearchtool/libeggsmclient/eggsmclient.c b/gsearchtool/libeggsmclient/eggsmclient.c index 4b114e1e..c1720381 100644 --- a/gsearchtool/libeggsmclient/eggsmclient.c +++ b/gsearchtool/libeggsmclient/eggsmclient.c @@ -324,13 +324,13 @@ egg_sm_client_get (void) * (since it supports state saving) and fall back to D-Bus * if XSMP isn't available. */ -# ifdef EGG_SM_CLIENT_BACKEND_XSMP +#ifdef EGG_SM_CLIENT_BACKEND_XSMP global_client = egg_sm_client_xsmp_new (); -# endif -# ifdef EGG_SM_CLIENT_BACKEND_DBUS +#endif +#ifdef EGG_SM_CLIENT_BACKEND_DBUS if (!global_client) global_client = egg_sm_client_dbus_new (); -# endif +#endif } /* Fallback: create a dummy client, so that callers don't have diff --git a/logview/src/logview-findbar.c b/logview/src/logview-findbar.c index 768b1e01..ece45651 100644 --- a/logview/src/logview-findbar.c +++ b/logview/src/logview-findbar.c @@ -232,7 +232,7 @@ logview_findbar_init (LogviewFindbar *findbar) gtk_tool_item_set_expand (priv->status_item, TRUE); priv->message = gtk_label_new (""); gtk_label_set_use_markup (GTK_LABEL (priv->message), TRUE); -#if GTK_CHECK_VERSION(3,16,0) +#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL (priv->message), 0.0); gtk_label_set_yalign (GTK_LABEL (priv->message), 0.5); #else diff --git a/mate-dictionary/libgdict/gdict-strategy-chooser.c b/mate-dictionary/libgdict/gdict-strategy-chooser.c index 0bff792e..9e6d0b1c 100644 --- a/mate-dictionary/libgdict/gdict-strategy-chooser.c +++ b/mate-dictionary/libgdict/gdict-strategy-chooser.c @@ -467,7 +467,7 @@ gdict_strategy_chooser_init (GdictStrategyChooser *chooser) GdictStrategyChooserPrivate *priv; #if GTK_CHECK_VERSION(3,0,0) -chooser->priv = priv = gdict_strategy_chooser_get_instance_private (chooser); + chooser->priv = priv = gdict_strategy_chooser_get_instance_private (chooser); #else chooser->priv = priv = GDICT_STRATEGY_CHOOSER_GET_PRIVATE (chooser); #endif diff --git a/mate-screenshot/src/screenshot-utils.c b/mate-screenshot/src/screenshot-utils.c index 92b371dd..4c1f4f7e 100644 --- a/mate-screenshot/src/screenshot-utils.c +++ b/mate-screenshot/src/screenshot-utils.c @@ -507,9 +507,9 @@ create_select_window (void) g_signal_connect (window, "expose-event", G_CALLBACK (expose), NULL); #endif - gtk_window_move (GTK_WINDOW (window), -100, -100); - gtk_window_resize (GTK_WINDOW (window), 10, 10); - gtk_widget_show (window); + gtk_window_move (GTK_WINDOW (window), -100, -100); + gtk_window_resize (GTK_WINDOW (window), 10, 10); + gtk_widget_show (window); return window; } @@ -631,7 +631,7 @@ screenshot_select_area_async (SelectAreaCallback callback) gdk_cursor_unref (cursor); gdk_flush (); - out: +out: cb_data->rectangle = data.rect; /* FIXME: we should actually be emitting the callback When |