diff -Nru xfce4-indicator-plugin-2.3.1/ChangeLog xfce4-indicator-plugin-2.3.2/ChangeLog --- xfce4-indicator-plugin-2.3.1/ChangeLog 2014-03-06 21:03:50.000000000 +0000 +++ xfce4-indicator-plugin-2.3.2/ChangeLog 2014-03-15 21:34:24.000000000 +0000 @@ -1,4 +1,7 @@ # created with git log --pretty=format:"%ad %h %s %aN <%aE>" --no-merges --date=short +2014-03-15 162fac0 Fix blank properties window, but #10749 Andrzej +2014-03-06 7c56c15 Back to development Andrzej +2014-03-06 0e63aaf Updates for the release Andrzej 2014-03-06 f74e861 Changed border-width to 1px. Andrzej 2014-03-06 fb527c4 Set default theme setting (thanks ochosi) Andrzej 2014-02-26 09f0c1e I18n: Add new translation ms (100%). abuyop diff -Nru xfce4-indicator-plugin-2.3.1/configure xfce4-indicator-plugin-2.3.2/configure --- xfce4-indicator-plugin-2.3.1/configure 2014-03-06 21:06:21.000000000 +0000 +++ xfce4-indicator-plugin-2.3.2/configure 2014-03-15 21:36:00.000000000 +0000 @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac 0e63aaf. +# From configure.ac f33e74e. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for xfce4-indicator-plugin 2.3.1. +# Generated by GNU Autoconf 2.69 for xfce4-indicator-plugin 2.3.2. # # Report bugs to . # @@ -594,8 +594,8 @@ # Identity of this package. PACKAGE_NAME='xfce4-indicator-plugin' PACKAGE_TARNAME='xfce4-indicator-plugin' -PACKAGE_VERSION='2.3.1' -PACKAGE_STRING='xfce4-indicator-plugin 2.3.1' +PACKAGE_VERSION='2.3.2' +PACKAGE_STRING='xfce4-indicator-plugin 2.3.2' PACKAGE_BUGREPORT='http://bugzilla.xfce.org/' PACKAGE_URL='' @@ -1426,7 +1426,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xfce4-indicator-plugin 2.3.1 to adapt to many kinds of systems. +\`configure' configures xfce4-indicator-plugin 2.3.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1502,7 +1502,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xfce4-indicator-plugin 2.3.1:";; + short | recursive ) echo "Configuration of xfce4-indicator-plugin 2.3.2:";; esac cat <<\_ACEOF @@ -1627,7 +1627,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xfce4-indicator-plugin configure 2.3.1 +xfce4-indicator-plugin configure 2.3.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1999,7 +1999,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xfce4-indicator-plugin $as_me 2.3.1, which was +It was created by xfce4-indicator-plugin $as_me 2.3.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2977,7 +2977,7 @@ # Define the identity of the package. PACKAGE='xfce4-indicator-plugin' - VERSION='2.3.1' + VERSION='2.3.2' cat >>confdefs.h <<_ACEOF @@ -15933,7 +15933,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xfce4-indicator-plugin $as_me 2.3.1, which was +This file was extended by xfce4-indicator-plugin $as_me 2.3.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15999,7 +15999,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -xfce4-indicator-plugin config.status 2.3.1 +xfce4-indicator-plugin config.status 2.3.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru xfce4-indicator-plugin-2.3.1/configure.ac xfce4-indicator-plugin-2.3.2/configure.ac --- xfce4-indicator-plugin-2.3.1/configure.ac 2014-03-06 21:06:16.000000000 +0000 +++ xfce4-indicator-plugin-2.3.2/configure.ac 2014-03-15 21:35:54.000000000 +0000 @@ -13,9 +13,9 @@ dnl *************************** m4_define([indicator_version_major], [2]) m4_define([indicator_version_minor], [3]) -m4_define([indicator_version_micro], [1]) +m4_define([indicator_version_micro], [2]) m4_define([indicator_version_nano], []) dnl leave this empty to have no nano version -m4_define([indicator_version_build], [0e63aaf]) +m4_define([indicator_version_build], [f33e74e]) m4_define([indicator_version_tag], []) m4_define([indicator_version], [indicator_version_major().indicator_version_minor().indicator_version_micro()ifelse(indicator_version_nano(), [], [], [.indicator_version_nano()])ifelse(indicator_version_tag(), [git], [indicator_version_tag()-indicator_version_build()], [indicator_version_tag()])]) @@ -28,7 +28,7 @@ AC_PREREQ([2.50]) AC_CONFIG_HEADERS([config.h]) AC_CANONICAL_TARGET() -AC_REVISION([0e63aaf]) +AC_REVISION([f33e74e]) dnl *************************** dnl *** Initialize automake *** diff -Nru xfce4-indicator-plugin-2.3.1/debian/changelog xfce4-indicator-plugin-2.3.2/debian/changelog --- xfce4-indicator-plugin-2.3.1/debian/changelog 2014-03-12 12:18:25.000000000 +0000 +++ xfce4-indicator-plugin-2.3.2/debian/changelog 2014-03-18 13:29:04.000000000 +0000 @@ -1,3 +1,10 @@ +xfce4-indicator-plugin (2.3.2-0ubuntu1) trusty; urgency=medium + + * New upstream release. + - Fixed xfce bug #10749: "blank properties window". LP: #1290803 + + -- Jackson Doak Sun, 16 Mar 2014 09:01:47 +1100 + xfce4-indicator-plugin (2.3.1-0ubuntu1) trusty; urgency=medium * New upstream bugfix release. diff -Nru xfce4-indicator-plugin-2.3.1/panel-plugin/indicator.c xfce4-indicator-plugin-2.3.2/panel-plugin/indicator.c --- xfce4-indicator-plugin-2.3.1/panel-plugin/indicator.c 2014-03-05 23:14:25.000000000 +0000 +++ xfce4-indicator-plugin-2.3.2/panel-plugin/indicator.c 2014-03-15 00:22:00.000000000 +0000 @@ -92,6 +92,9 @@ /* indicator settings */ IndicatorConfig *config; + /* config dialog builder */ + IndicatorDialog *dialog; + /* log file */ FILE *logfile; }; @@ -191,7 +194,7 @@ { IndicatorPlugin *indicator = XFCE_INDICATOR_PLUGIN (plugin); - indicator_dialog_show (gtk_widget_get_screen (GTK_WIDGET (plugin)), indicator->config); + indicator_dialog_show (indicator->dialog, gtk_widget_get_screen (GTK_WIDGET (plugin))); } @@ -297,6 +300,9 @@ /* initialize xfconf */ indicator->config = indicator_config_new (xfce_panel_plugin_get_property_base (plugin)); + /* instantiate preference dialog builder */ + indicator->dialog = indicator_dialog_new (indicator->config); + /* instantiate a button box */ indicator->buttonbox = xfce_indicator_box_new (indicator->config); gtk_container_add (GTK_CONTAINER (plugin), GTK_WIDGET(indicator->buttonbox)); diff -Nru xfce4-indicator-plugin-2.3.1/panel-plugin/indicator-dialog.c xfce4-indicator-plugin-2.3.2/panel-plugin/indicator-dialog.c --- xfce4-indicator-plugin-2.3.1/panel-plugin/indicator-dialog.c 2014-02-14 22:18:08.000000000 +0000 +++ xfce4-indicator-plugin-2.3.2/panel-plugin/indicator-dialog.c 2014-03-15 00:21:44.000000000 +0000 @@ -80,9 +80,6 @@ #define ICON_SIZE (22) static void indicator_dialog_build (IndicatorDialog *dialog); -static void indicator_dialog_close_button_clicked (IndicatorDialog *dialog, - GtkWidget *button); - static void indicator_dialog_help_button_clicked (IndicatorDialog *dialog, GtkWidget *button); @@ -481,8 +478,8 @@ object = gtk_builder_get_object (builder, "close-button"); g_return_if_fail (GTK_IS_BUTTON (object)); g_signal_connect_swapped (G_OBJECT (object), "clicked", - G_CALLBACK (indicator_dialog_close_button_clicked), - dialog); + G_CALLBACK (gtk_widget_destroy), + dialog->dialog); object = gtk_builder_get_object (builder, "help-button"); g_return_if_fail (GTK_IS_BUTTON (object)); @@ -558,19 +555,6 @@ static void -indicator_dialog_close_button_clicked (IndicatorDialog *dialog, - GtkWidget *button) -{ - g_return_if_fail (XFCE_IS_INDICATOR_DIALOG (dialog)); - g_return_if_fail (GTK_IS_BUTTON (button)); - g_return_if_fail (GTK_IS_WINDOW (dialog->dialog)); - - gtk_widget_destroy (GTK_WIDGET (dialog->dialog)); - g_object_unref (G_OBJECT (dialog)); -} - - -static void indicator_dialog_help_button_clicked (IndicatorDialog *dialog, GtkWidget *button) { @@ -598,26 +582,28 @@ void -indicator_dialog_show (GdkScreen *screen, - IndicatorConfig *config) +indicator_dialog_show (IndicatorDialog *dialog, + GdkScreen *screen) { - static IndicatorDialog *dialog = NULL; - + g_return_if_fail (XFCE_IS_INDICATOR_DIALOG (dialog)); g_return_if_fail (GDK_IS_SCREEN (screen)); - g_return_if_fail (XFCE_IS_INDICATOR_CONFIG (config)); - if (dialog == NULL) - { - dialog = g_object_new (XFCE_TYPE_INDICATOR_DIALOG, NULL); - g_object_add_weak_pointer (G_OBJECT (dialog), (gpointer *) &dialog); - dialog->config = config; - indicator_dialog_build (XFCE_INDICATOR_DIALOG (dialog)); - gtk_widget_show (GTK_WIDGET (dialog->dialog)); - } - else - { - gtk_window_present (GTK_WINDOW (dialog->dialog)); - } + indicator_dialog_build (XFCE_INDICATOR_DIALOG (dialog)); + gtk_widget_show (GTK_WIDGET (dialog->dialog)); gtk_window_set_screen (GTK_WINDOW (dialog->dialog), screen); } + + +IndicatorDialog * +indicator_dialog_new (IndicatorConfig *config) +{ + IndicatorDialog *dialog; + + g_return_val_if_fail (XFCE_IS_INDICATOR_CONFIG (config), NULL); + + dialog = g_object_new (XFCE_TYPE_INDICATOR_DIALOG, NULL); + dialog->config = config; + + return dialog; +} diff -Nru xfce4-indicator-plugin-2.3.1/panel-plugin/indicator-dialog.h xfce4-indicator-plugin-2.3.2/panel-plugin/indicator-dialog.h --- xfce4-indicator-plugin-2.3.1/panel-plugin/indicator-dialog.h 2013-12-18 18:52:30.000000000 +0000 +++ xfce4-indicator-plugin-2.3.2/panel-plugin/indicator-dialog.h 2014-03-15 00:18:00.000000000 +0000 @@ -34,10 +34,12 @@ #define XFCE_IS_INDICATOR_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), XFCE_TYPE_INDICATOR_DIALOG)) #define XFCE_INDICATOR_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), XFCE_TYPE_INDICATOR_DIALOG, IndicatorDialogClass)) -GType indicator_dialog_get_type (void) G_GNUC_CONST; +GType indicator_dialog_get_type (void) G_GNUC_CONST; -void indicator_dialog_show (GdkScreen *screen, - IndicatorConfig *config); +void indicator_dialog_show (IndicatorDialog *dialog, + GdkScreen *screen); + +IndicatorDialog *indicator_dialog_new (IndicatorConfig *config); G_END_DECLS