From e3b5ac73954fe0b9d1ae554e786f7dc252661ef4 Mon Sep 17 00:00:00 2001 From: Cristian Henzel Date: Sun, 19 Dec 2010 14:21:42 +0200 Subject: [PATCH] ClipIt-v1.3.9-19122010001 + Fixed: Fixed error while compiling without indicator support. + Fixed: Fixed a couple of memory leaks. Changes to be committed: modified: ChangeLog modified: autom4te.cache/output.0 modified: autom4te.cache/output.1 modified: autom4te.cache/requests modified: autom4te.cache/traces.1 modified: configure modified: configure.in modified: src/history.c modified: src/main.c modified: src/manage.c modified: src/preferences.c --- ChangeLog | 4 ++++ autom4te.cache/output.0 | 20 ++++++++++---------- autom4te.cache/output.1 | 20 ++++++++++---------- autom4te.cache/requests | 4 ++-- autom4te.cache/traces.1 | 2 +- configure | 20 ++++++++++---------- configure.in | 2 +- src/history.c | 2 ++ src/main.c | 11 +++++------ src/manage.c | 4 +--- src/preferences.c | 1 + 11 files changed, 47 insertions(+), 43 deletions(-) diff --git a/ChangeLog b/ChangeLog index fe198b3..9735ddd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +ClipIt-v1.3.9-19122010001 - 19 Dec. 2010 + + Fixed: Fixed error while compiling without indicator support. + + Fixed: Fixed a couple of memory leaks. + ClipIt-v1.3.8-18122010002 - 18 Dec. 2010 + Fixed: Updated configure script for 1.3.8. diff --git a/autom4te.cache/output.0 b/autom4te.cache/output.0 index 9d3bead..0eeefe6 100644 --- a/autom4te.cache/output.0 +++ b/autom4te.cache/output.0 @@ -1,6 +1,6 @@ @%:@! /bin/sh @%:@ Guess values for system-dependent variables and create Makefiles. -@%:@ Generated by GNU Autoconf 2.67 for clipit 1.3.8. +@%:@ Generated by GNU Autoconf 2.67 for clipit 1.3.9. @%:@ @%:@ Report bugs to . @%:@ @@ -552,8 +552,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='clipit' PACKAGE_TARNAME='clipit' -PACKAGE_VERSION='1.3.8' -PACKAGE_STRING='clipit 1.3.8' +PACKAGE_VERSION='1.3.9' +PACKAGE_STRING='clipit 1.3.9' PACKAGE_BUGREPORT='oss@rspwn.com' PACKAGE_URL='' @@ -1327,7 +1327,7 @@ if test "$ac_init_help" = "long"; then # 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 clipit 1.3.8 to adapt to many kinds of systems. +\`configure' configures clipit 1.3.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1397,7 +1397,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of clipit 1.3.8:";; + short | recursive ) echo "Configuration of clipit 1.3.9:";; esac cat <<\_ACEOF @@ -1510,7 +1510,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -clipit configure 1.3.8 +clipit configure 1.3.9 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1879,7 +1879,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by clipit $as_me 1.3.8, which was +It was created by clipit $as_me 1.3.9, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -2695,7 +2695,7 @@ fi # Define the identity of the package. PACKAGE=clipit - VERSION=1.3.8 + VERSION=1.3.9 cat >>confdefs.h <<_ACEOF @@ -9760,7 +9760,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by clipit $as_me 1.3.8, which was +This file was extended by clipit $as_me 1.3.9, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9826,7 +9826,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -clipit config.status 1.3.8 +clipit config.status 1.3.9 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" diff --git a/autom4te.cache/output.1 b/autom4te.cache/output.1 index 9d3bead..0eeefe6 100644 --- a/autom4te.cache/output.1 +++ b/autom4te.cache/output.1 @@ -1,6 +1,6 @@ @%:@! /bin/sh @%:@ Guess values for system-dependent variables and create Makefiles. -@%:@ Generated by GNU Autoconf 2.67 for clipit 1.3.8. +@%:@ Generated by GNU Autoconf 2.67 for clipit 1.3.9. @%:@ @%:@ Report bugs to . @%:@ @@ -552,8 +552,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='clipit' PACKAGE_TARNAME='clipit' -PACKAGE_VERSION='1.3.8' -PACKAGE_STRING='clipit 1.3.8' +PACKAGE_VERSION='1.3.9' +PACKAGE_STRING='clipit 1.3.9' PACKAGE_BUGREPORT='oss@rspwn.com' PACKAGE_URL='' @@ -1327,7 +1327,7 @@ if test "$ac_init_help" = "long"; then # 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 clipit 1.3.8 to adapt to many kinds of systems. +\`configure' configures clipit 1.3.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1397,7 +1397,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of clipit 1.3.8:";; + short | recursive ) echo "Configuration of clipit 1.3.9:";; esac cat <<\_ACEOF @@ -1510,7 +1510,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -clipit configure 1.3.8 +clipit configure 1.3.9 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1879,7 +1879,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by clipit $as_me 1.3.8, which was +It was created by clipit $as_me 1.3.9, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -2695,7 +2695,7 @@ fi # Define the identity of the package. PACKAGE=clipit - VERSION=1.3.8 + VERSION=1.3.9 cat >>confdefs.h <<_ACEOF @@ -9760,7 +9760,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by clipit $as_me 1.3.8, which was +This file was extended by clipit $as_me 1.3.9, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9826,7 +9826,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -clipit config.status 1.3.8 +clipit config.status 1.3.9 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" diff --git a/autom4te.cache/requests b/autom4te.cache/requests index 654f9a9..07f45d8 100644 --- a/autom4te.cache/requests +++ b/autom4te.cache/requests @@ -75,18 +75,18 @@ 'AC_LIB_PREPARE_PREFIX' => 1, 'AM_XGETTEXT_OPTION_INIT' => 1, 'AC_DEFUN' => 1, + 'AM_PROG_MKDIR_P' => 1, 'AM_GLIB_GNU_GETTEXT' => 1, 'gl_AC_HEADER_STDINT_H' => 1, - 'AM_PROG_MKDIR_P' => 1, 'AM_AUTOMAKE_VERSION' => 1, 'gl_SIZE_MAX' => 1, 'AM_MISSING_HAS_RUN' => 1, 'AC_LIB_RPATH' => 1, 'AC_TYPE_LONG_LONG_INT' => 1, 'AM_SUBST_NOTMAKE' => 1, + 'AM_PATH_GTK_2_0' => 1, 'AM_MISSING_PROG' => 1, 'gt_PRINTF_POSIX' => 1, - 'AM_PATH_GTK_2_0' => 1, 'IT_PO_SUBDIR' => 1, 'AM_GNU_GETTEXT_VERSION' => 1, 'AC_LIB_PROG_LD_GNU' => 1, diff --git a/autom4te.cache/traces.1 b/autom4te.cache/traces.1 index a022956..2cd16fd 100644 --- a/autom4te.cache/traces.1 +++ b/autom4te.cache/traces.1 @@ -8,7 +8,7 @@ m4trace:aclocal.m4:2010: -1- m4_include([m4/lib-prefix.m4]) m4trace:aclocal.m4:2011: -1- m4_include([m4/nls.m4]) m4trace:aclocal.m4:2012: -1- m4_include([m4/po.m4]) m4trace:aclocal.m4:2013: -1- m4_include([m4/progtest.m4]) -m4trace:configure.in:5: -1- AC_INIT([clipit], [1.3.8], [oss@rspwn.com]) +m4trace:configure.in:5: -1- AC_INIT([clipit], [1.3.9], [oss@rspwn.com]) m4trace:configure.in:5: -1- m4_pattern_forbid([^_?A[CHUM]_]) m4trace:configure.in:5: -1- m4_pattern_forbid([_AC_]) m4trace:configure.in:5: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS']) diff --git a/configure b/configure index aeaea43..ad03678 100644 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for clipit 1.3.8. +# Generated by GNU Autoconf 2.67 for clipit 1.3.9. # # Report bugs to . # @@ -552,8 +552,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='clipit' PACKAGE_TARNAME='clipit' -PACKAGE_VERSION='1.3.8' -PACKAGE_STRING='clipit 1.3.8' +PACKAGE_VERSION='1.3.9' +PACKAGE_STRING='clipit 1.3.9' PACKAGE_BUGREPORT='oss@rspwn.com' PACKAGE_URL='' @@ -1327,7 +1327,7 @@ if test "$ac_init_help" = "long"; then # 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 clipit 1.3.8 to adapt to many kinds of systems. +\`configure' configures clipit 1.3.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1397,7 +1397,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of clipit 1.3.8:";; + short | recursive ) echo "Configuration of clipit 1.3.9:";; esac cat <<\_ACEOF @@ -1510,7 +1510,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -clipit configure 1.3.8 +clipit configure 1.3.9 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1879,7 +1879,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by clipit $as_me 1.3.8, which was +It was created by clipit $as_me 1.3.9, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -2695,7 +2695,7 @@ fi # Define the identity of the package. PACKAGE=clipit - VERSION=1.3.8 + VERSION=1.3.9 cat >>confdefs.h <<_ACEOF @@ -9760,7 +9760,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by clipit $as_me 1.3.8, which was +This file was extended by clipit $as_me 1.3.9, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9826,7 +9826,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -clipit config.status 1.3.8 +clipit config.status 1.3.9 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" diff --git a/configure.in b/configure.in index 21a5eca..4e26711 100644 --- a/configure.in +++ b/configure.in @@ -2,7 +2,7 @@ # Autoconf/automake. # ------------------------------------------------------------------------------- AC_PREREQ([2.5]) -AC_INIT([clipit], [1.3.8], [oss@rspwn.com]) +AC_INIT([clipit], [1.3.9], [oss@rspwn.com]) AM_INIT_AUTOMAKE([AC_PACKAGE_TARNAME()], [AC_PACKAGE_VERSION()]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/src/history.c b/src/history.c index 59857f9..b9cba00 100644 --- a/src/history.c +++ b/src/history.c @@ -102,7 +102,9 @@ void save_history() /* Refresh indicator menu. Temporary solution until * getting the visible status of the menu is supported by the API */ +#ifdef HAVE_APPINDICATOR create_app_indicator(0); +#endif } /* Checks if item should be included in history and calls append */ diff --git a/src/main.c b/src/main.c index b638b8b..d2289a3 100644 --- a/src/main.c +++ b/src/main.c @@ -25,7 +25,6 @@ #include #include -#include #include #ifdef HAVE_APPINDICATOR #include @@ -46,7 +45,7 @@ static GtkClipboard* primary; static GtkClipboard* clipboard; #ifdef HAVE_APPINDICATOR static AppIndicator *indicator; -GtkWidget *indicator_menu = NULL; +static GtkWidget *indicator_menu = NULL; #else static GtkStatusIcon *status_icon; static GtkWidget *statusicon_menu = NULL; @@ -503,8 +502,7 @@ static gboolean show_actions_menu(gpointer data) static gboolean show_history_menu_full(gpointer data) { /* Declare some variables */ - GtkWidget *menu, *menu_item, - *menu_image, *item_label; + GtkWidget *menu, *menu_item, *menu_image, *item_label; /* Create the menu */ menu = gtk_menu_new(); @@ -1050,7 +1048,7 @@ static void clipit_init() } /* This is Sparta! */ -int main(int argc, char *argv[]) +int main(int argc, char **argv) { bindtextdomain(GETTEXT_PACKAGE, CLIPITLOCALEDIR); bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); @@ -1116,11 +1114,12 @@ int main(int argc, char *argv[]) g_free(prefs.actions_key); g_free(prefs.menu_key); g_free(prefs.search_key); + g_slist_foreach(history, (GFunc)g_free, NULL); g_slist_free(history); g_free(primary_text); g_free(clipboard_text); g_free(synchronized_text); - + /* Exit */ return 0; } diff --git a/src/manage.c b/src/manage.c index 4d4c37e..1ee8889 100644 --- a/src/manage.c +++ b/src/manage.c @@ -242,9 +242,7 @@ gboolean show_search() if(gtk_grab_get_current()) return FALSE; /* Declare some variables */ - GtkWidget *frame, *label, - *alignment, *hbox, - *vbox; + GtkWidget *hbox; GtkTreeViewColumn *tree_column; diff --git a/src/preferences.c b/src/preferences.c index 066ccc8..f0b4565 100644 --- a/src/preferences.c +++ b/src/preferences.c @@ -168,6 +168,7 @@ static void first_run_check() prefs.search_key = DEF_SEARCH_KEY; save_preferences(); } + g_free(rc_file); } /* Ask the user if he wants to delete the history file and act accordingly */