Skip to content

Commit

Permalink
* Merged Ludwig Nussel's patch to silence gcc warnings.
Browse files Browse the repository at this point in the history
* Updated changelog.


git-svn-id: https://parcellite.svn.sourceforge.net/svnroot/parcellite@105 b25b1718-469e-46af-be73-919d414b4ebe
  • Loading branch information
xyhthyx committed Dec 26, 2009
1 parent 47b6b84 commit 02cc4c4
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
2 changes: 2 additions & 0 deletions trunk/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
v0.9.2 Pending...

New
+ Danish translation (by Kim Jensen).
+ French translation (by Vincent Coiffier).

Changes
+ Clear option clears clipboard and primary contents.
+ Use accessor functions instead direct access (by Javier Jardon).
+ Add missing include statements to silence gcc warnings (by Ludwig Nussel).
+ Empty clipboard and primary recovery no longer overwrites contents of other types.
+ Removes newline characters ('\n') from the history menu entries (by Daniel Di Marco).

Expand Down
2 changes: 1 addition & 1 deletion trunk/src/keybinder.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/


#include <string.h>
#include <gdk/gdk.h>
#include <gdk/gdkwindow.h>
#include <gdk/gdkx.h>
Expand Down
14 changes: 8 additions & 6 deletions trunk/src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

#include <glib.h>
#include <stdlib.h>
#include <unistd.h>
#include <gtk/gtk.h>
#include <pthread.h>
#include "main.h"
Expand Down Expand Up @@ -67,9 +68,9 @@ item_check(gpointer data)
{
/* Check contents */
gint count;
GdkAtom *targets;
gboolean contents = gtk_clipboard_wait_for_targets(primary, &targets, &count);
g_free(targets);
GdkAtom *targets;
gboolean contents = gtk_clipboard_wait_for_targets(primary, &targets, &count);
g_free(targets);
/* Only recover lost contents if there isn't any other type of content in the clipboard */
if (!contents)
{
Expand Down Expand Up @@ -113,12 +114,13 @@ item_check(gpointer data)
{
/* Check contents */
gint count;
GdkAtom *targets;
gboolean contents = gtk_clipboard_wait_for_targets(primary, &targets, &count);
g_free(targets);
GdkAtom *targets;
gboolean contents = gtk_clipboard_wait_for_targets(primary, &targets, &count);
g_free(targets);
/* Only recover lost contents if there isn't any other type of content in the clipboard */
if (!contents)
{
g_print("Clipboard is null, recovering ...\n");
gtk_clipboard_set_text(clipboard, clipboard_text, -1);
}
}
Expand Down

0 comments on commit 02cc4c4

Please sign in to comment.