diff options
| -rw-r--r-- | capplet/gsp-app.c | 2 | ||||
| -rw-r--r-- | data/session-properties.ui | 1 | ||||
| -rw-r--r-- | mate-session/gsm-logout-dialog.c | 4 | ||||
| -rw-r--r-- | mate-session/gsm-systemd.c | 2 | ||||
| -rw-r--r-- | mate-session/main.c | 10 |
5 files changed, 17 insertions, 2 deletions
diff --git a/capplet/gsp-app.c b/capplet/gsp-app.c index ab631aa..3652197 100644 --- a/capplet/gsp-app.c +++ b/capplet/gsp-app.c @@ -729,7 +729,7 @@ gsp_app_reload_at (GspApp *app, gsp_app_new (path, xdg_position); } -gboolean +static gboolean gsp_app_can_launch (GKeyFile *keyfile) { char **only_show_in, **not_show_in; diff --git a/data/session-properties.ui b/data/session-properties.ui index 24f721d..87110d0 100644 --- a/data/session-properties.ui +++ b/data/session-properties.ui @@ -31,6 +31,7 @@ <object class="GtkHBox" id="hbox1"> <property name="visible">True</property> <property name="spacing">6</property> + <property name="expand">True</property> <child> <object class="GtkScrolledWindow" id="scrolledwindow1"> <property name="visible">True</property> diff --git a/mate-session/gsm-logout-dialog.c b/mate-session/gsm-logout-dialog.c index 4d70d58..1f5846b 100644 --- a/mate-session/gsm-logout-dialog.c +++ b/mate-session/gsm-logout-dialog.c @@ -499,7 +499,11 @@ gsm_get_dialog (GsmDialogLogoutType type, dialog_image = gtk_message_dialog_get_image (GTK_MESSAGE_DIALOG (logout_dialog)); +#if GTK_CHECK_VERSION (3, 0, 0) + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); +#else hbox = gtk_hbox_new (FALSE, 0); +#endif logout_dialog->priv->progressbar = gtk_progress_bar_new (); gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (logout_dialog->priv->progressbar), 1.0); gtk_box_pack_start (GTK_BOX (hbox), diff --git a/mate-session/gsm-systemd.c b/mate-session/gsm-systemd.c index 3804fed..3ef6e48 100644 --- a/mate-session/gsm-systemd.c +++ b/mate-session/gsm-systemd.c @@ -868,7 +868,7 @@ gchar * gsm_systemd_get_current_session_type (GsmSystemd *manager) { GError *gerror; - gchar *session_id; + gchar *session_id = NULL; gchar *session_class = NULL; #ifdef HAVE_SYSTEMD int res; diff --git a/mate-session/main.c b/mate-session/main.c index 8608852..f09806f 100644 --- a/mate-session/main.c +++ b/mate-session/main.c @@ -468,7 +468,11 @@ int main(int argc, char** argv) { struct sigaction sa; GError* error; +#if GTK_CHECK_VERSION (3, 0, 0) + const char* display_str; +#else char* display_str; +#endif GsmManager* manager; GsmStore* client_store; GsmXsmpServer* xsmp_server; @@ -519,9 +523,15 @@ int main(int argc, char** argv) /* Set DISPLAY explicitly for all our children, in case --display * was specified on the command line. */ +#if GTK_CHECK_VERSION (3, 0, 0) + display_str = gdk_display_get_name (gdk_display_get_default()); +#else display_str = gdk_get_display(); +#endif gsm_util_setenv("DISPLAY", display_str); +#if !GTK_CHECK_VERSION (3, 0, 0) g_free(display_str); +#endif /* Some third-party programs rely on MATE_DESKTOP_SESSION_ID to * detect if MATE is running. We keep this for compatibility reasons. |