[Xfce4-commits] <mousepad:master> * mousepad/mousepad-{window, util}.c: Fix compiler warnings.

[Nick Schermer]

Updating branch refs/heads/master
         to 8a4f2f2e71d3fa064295bbbe0ca4697e562878f3 (commit)
       from 73fe06eded04e6c604a49caf443cf3cc7d22ddbf (commit)

commit 8a4f2f2e71d3fa064295bbbe0ca4697e562878f3
Author: Nick Schermer <nick at xfce.org>
Date:   Wed Oct 17 09:48:30 2007 +0000

    * mousepad/mousepad-{window,util}.c: Fix compiler warnings.
    
    
    (Old svn revision: 26140)

 ChangeLog                  |    4 ++++
 mousepad/mousepad-util.c   |    8 ++++----
 mousepad/mousepad-window.c |    3 +++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8c92023..213e47c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-17      Nick Schermer <nick at xfce.org>
+    * mousepad/mousepad-{window,util}.c: Fix compiler warnings.
+
+
 2007-10-16      Nick Schermer <nick at xfce.org>
 	* mousepad/mousepad-dialogs.c: Set the correct default return
 	  in the jump dialog.
diff --git a/mousepad/mousepad-util.c b/mousepad/mousepad-util.c
index 28316c8..1cd89e3 100644
--- a/mousepad/mousepad-util.c
+++ b/mousepad/mousepad-util.c
@@ -487,15 +487,15 @@ mousepad_util_search (GtkTextBuffer       *buffer,
   mark_start = gtk_text_buffer_create_mark (buffer, NULL, &start, TRUE);
   mark_iter  = gtk_text_buffer_create_mark (buffer, NULL, &iter, TRUE);
   mark_end   = gtk_text_buffer_create_mark (buffer, NULL, &end, TRUE);
+  
+  /* some to make the code easier to read */
+  search_backwards = ((flags & MOUSEPAD_SEARCH_FLAGS_DIR_BACKWARD) != 0);
+  wrap_around = ((flags & MOUSEPAD_SEARCH_FLAGS_WRAP_AROUND) != 0 && !gtk_text_iter_equal (&start, &iter));
 
   /* if we're not really searching anything, reset the cursor */
   if (string == NULL || *string == '\0')
     goto reset_cursor;
 
-  /* some to make the code easier to read */
-  search_backwards = (flags & MOUSEPAD_SEARCH_FLAGS_DIR_BACKWARD) != 0;
-  wrap_around = (flags & MOUSEPAD_SEARCH_FLAGS_WRAP_AROUND) != 0 && !gtk_text_iter_equal (&start, &iter);
-
   if (search_backwards)
     {
       /* reverse the search string */
diff --git a/mousepad/mousepad-window.c b/mousepad/mousepad-window.c
index 40246dc..e8f3605 100644
--- a/mousepad/mousepad-window.c
+++ b/mousepad/mousepad-window.c
@@ -1020,6 +1020,9 @@ mousepad_window_add (MousepadWindow   *window,
 
   /* create the tab label */
   label = mousepad_document_get_tab_label (document);
+  
+  /* get active page */
+  page = gtk_notebook_get_current_page (GTK_NOTEBOOK (window->notebook));
 
   /* insert the page right of the active tab */
   page = gtk_notebook_insert_page (GTK_NOTEBOOK (window->notebook), GTK_WIDGET (document), label, page + 1);