gnome-terminal r2596 - trunk/src

[chpe svn gnome org]

Author: chpe
Date: Thu May 29 19:37:02 2008
New Revision: 2596
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=2596&view=rev

Log:
Fix compile warnings.


Modified:
   trunk/src/Makefile.am
   trunk/src/profile-editor.c
   trunk/src/terminal-accels.c
   trunk/src/terminal-screen-container.c
   trunk/src/terminal-screen.c
   trunk/src/terminal-window.c

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Thu May 29 19:37:02 2008
@@ -44,11 +44,13 @@
 	-DSN_API_NOT_YET_FROZEN \
 	$(AM_CPPFLAGS)
 
+# $(DISABLE_DEPRECATED)
 #	-DGTK_DISABLE_DEPRECATED
 #	-DGNOME_DISABLE_DEPRECATED
 
 gnome_terminal_CFLAGS = \
 	$(TERM_CFLAGS) \
+	$(WARN_CFLAGS) \
 	$(AM_CFLAGS)
 
 gnome_terminal_LDFLAGS =
@@ -93,6 +95,7 @@
 
 CLEANFILES = \
 	gnome-terminal.schemas \
+	stamp-terminal-type-builtins.h \
 	$(BUILT_SOURCES)
 
 EXTRA_DIST = \

Modified: trunk/src/profile-editor.c
==============================================================================
--- trunk/src/profile-editor.c	(original)
+++ trunk/src/profile-editor.c	Thu May 29 19:37:02 2008
@@ -930,7 +930,6 @@
       double num1, num2;
       gint i;
       GtkSizeGroup *size_group;
-      GtkWidget *font_label;
 
       xml = terminal_util_load_glade_file (TERM_GLADE_FILE,
                                            "profile-editor-dialog",

Modified: trunk/src/terminal-accels.c
==============================================================================
--- trunk/src/terminal-accels.c	(original)
+++ trunk/src/terminal-accels.c	Thu May 29 19:37:02 2008
@@ -947,7 +947,7 @@
   GtkTreeModel *model;
   GtkTreePath *path;
   GtkTreeIter iter;
-  KeyEntry *ke, tmp_key;
+  KeyEntry *ke;
   char *str;
   GConfClient *conf;
 

Modified: trunk/src/terminal-screen-container.c
==============================================================================
--- trunk/src/terminal-screen-container.c	(original)
+++ trunk/src/terminal-screen-container.c	Thu May 29 19:37:02 2008
@@ -79,7 +79,7 @@
 }
 
 #ifndef USE_SCROLLED_WINDOW
-GtkWidget *
+static GtkWidget *
 terminal_screen_container_get_scrollbar (GtkWidget *container)
 {
   return g_object_get_data (G_OBJECT (container), SCROLLBAR_DATA_KEY);

Modified: trunk/src/terminal-screen.c
==============================================================================
--- trunk/src/terminal-screen.c	(original)
+++ trunk/src/terminal-screen.c	Thu May 29 19:37:02 2008
@@ -185,7 +185,6 @@
     }
   else
     {
-      GtkWidget *parent;
       GtkWidget *window;
 
       window = gtk_widget_get_toplevel (GTK_WIDGET (screen)->parent);
@@ -252,7 +251,6 @@
                                GParamSpec *pspec,
                                TerminalScreen *screen)
 {
-  TerminalScreenPrivate *priv = screen->priv;
   gboolean blink;
 
   g_object_get (G_OBJECT (settings),
@@ -464,7 +462,6 @@
 terminal_screen_dispose (GObject *object)
 {
   TerminalScreen *screen = TERMINAL_SCREEN (object);
-  TerminalScreenPrivate *priv = screen->priv;
   GtkSettings *settings;
 
   settings = gtk_widget_get_settings (GTK_WIDGET (screen));
@@ -814,7 +811,6 @@
 			      gpointer     user_data)
 {
   TerminalScreen *screen = TERMINAL_SCREEN (user_data);
-  TerminalScreenPrivate *priv = screen->priv;
   
   if (strcmp (entry->key, MONOSPACE_FONT_KEY) == 0 &&
       GTK_WIDGET_REALIZED (screen))
@@ -910,8 +906,6 @@
 static void
 terminal_screen_change_font (TerminalScreen *screen)
 {
-  TerminalScreenPrivate *priv = screen->priv;
-  
   terminal_screen_set_font (screen);
   terminal_screen_update_on_realize (VTE_TERMINAL (screen), screen);
 }
@@ -920,7 +914,6 @@
 profile_forgotten_callback (TerminalProfile *profile,
                             TerminalScreen  *screen)
 {
-  TerminalScreenPrivate *priv = screen->priv;
   TerminalProfile *new_profile;
 
   /* Revert to the new term profile if any */
@@ -1021,8 +1014,6 @@
 show_command_error_dialog (TerminalScreen *screen,
                            GError         *error)
 {
-  TerminalScreenPrivate *priv = screen->priv;
-  
   g_assert (error != NULL);
   
   terminal_util_show_error_dialog ((GtkWindow*) gtk_widget_get_ancestor (GTK_WIDGET (screen), GTK_TYPE_WINDOW), NULL,
@@ -1109,7 +1100,6 @@
 static char**
 get_child_environment (TerminalScreen *screen)
 {
-  TerminalScreenPrivate *priv = screen->priv;
   GtkWidget *term;
   gchar **p, **retval;
   gint i;
@@ -1318,7 +1308,7 @@
   /* screen should be finalized here, do not touch it past this point */
 }
 
-TerminalScreenPopupInfo *
+static TerminalScreenPopupInfo *
 terminal_screen_popup_info_new (TerminalScreen *screen)
 {
   TerminalScreenPrivate *priv = screen->priv;
@@ -1843,7 +1833,6 @@
                     gpointer          data)
 {
   TerminalScreen *screen = TERMINAL_SCREEN (data);
-  TerminalScreenPrivate *priv = screen->priv;
 
 #if 0
   {
@@ -1871,7 +1860,7 @@
       {
         char *str;
         
-        str = gtk_selection_data_get_text (selection_data);
+        str = (char *) gtk_selection_data_get_text (selection_data);
 
         /*
 	 * pass UTF-8 to the terminal widget. The terminal widget
@@ -1898,7 +1887,7 @@
         /* FIXME just brazenly ignoring encoding issues... */
         /* FIXMEchpe: just use the text conversion routines in gtk! */
         vte_terminal_feed_child (VTE_TERMINAL (screen),
-                                 selection_data->data,
+                                 (char *) selection_data->data,
                                  selection_data->length);
       }
       break;
@@ -2009,7 +1998,7 @@
             return;
           }
         
-        uri_list = g_strndup (selection_data->data,
+        uri_list = g_strndup ((char *) selection_data->data,
                               selection_data->length);
 
 	uris = g_strsplit (uri_list, "\r\n", 0);
@@ -2067,7 +2056,7 @@
             return;
           }
         
-        uri_list = g_strndup (selection_data->data,
+        uri_list = g_strndup ((char *) selection_data->data,
                               selection_data->length);
 
 	uris = g_strsplit (uri_list, "\r\n", 0);
@@ -2162,6 +2151,7 @@
 static void
 terminal_screen_setup_dnd (TerminalScreen *screen)
 {
+  /* FIXMEchpe: use modern gtk here! */
   static GtkTargetEntry target_table[] = {
     { "GTK_NOTEBOOK_TAB", GTK_TARGET_SAME_APP, TARGET_TAB },
     { "application/x-color", 0, TARGET_COLOR },
@@ -2178,7 +2168,6 @@
     /* add when gtk supports it perhaps */
     /* { "text/unicode", 0, TARGET_TEXT_UNICODE } */
   };
-  TerminalScreenPrivate *priv = screen->priv;
   
   g_signal_connect (screen, "drag_data_received",
                     G_CALLBACK (drag_data_received), screen);
@@ -2195,10 +2184,8 @@
 void
 terminal_screen_update_scrollbar (TerminalScreen *screen)
 {
-  TerminalScreenPrivate *priv = screen->priv;
   TerminalProfile *profile;
   GtkWidget *parent;
-  GtkScrolledWindow *scrolled_window;
   GtkPolicyType policy = GTK_POLICY_ALWAYS;
   GtkCornerType corner = GTK_CORNER_TOP_LEFT;
 

Modified: trunk/src/terminal-window.c
==============================================================================
--- trunk/src/terminal-window.c	(original)
+++ trunk/src/terminal-window.c	Thu May 29 19:37:02 2008
@@ -98,12 +98,6 @@
                                               GdkEvent *event,
                                               gpointer data);
 
-static void       screen_set_menuitem  (TerminalScreen *screen,
-                                        GtkWidget      *menuitem);
-static GtkWidget* screen_get_menuitem  (TerminalScreen *screen);
-static TerminalScreen* find_screen (TerminalWindow *window,
-                                    TerminalScreen *screen);
-
 static void notebook_page_selected_callback  (GtkWidget       *notebook,
                                               GtkNotebookPage *useless_crap,
                                               guint            page_num,
@@ -143,8 +137,6 @@
                                                TerminalWindow *window);
 static void edit_profiles_callback            (GtkAction *action,
                                                TerminalWindow *window);
-static void change_configuration_callback     (GtkAction *action,
-                                               TerminalWindow *window);
 static void edit_current_profile_callback     (GtkAction *action,
                                                TerminalWindow *window);
 static void file_new_profile_callback         (GtkAction *action,
@@ -178,10 +170,6 @@
 static void tabs_detach_tab_callback          (GtkAction *action,
                                                TerminalWindow *window);
 
-static void change_tab_callback           (GtkAction *action,
-                                           TerminalWindow *window);
-                                           /* FIXME? */
-
 static void help_contents_callback        (GtkAction *action,
                                            TerminalWindow *window);
 static void help_about_callback           (GtkAction *action,
@@ -480,7 +468,6 @@
   for (p = profiles; p != NULL; p = p->next)
     {
       TerminalProfile *profile = (TerminalProfile *) p->data;
-      char *profile_name, *display_name;
       char name[32];
 
       g_snprintf (name, sizeof (name), "FileNewTab%u", n);
@@ -519,7 +506,6 @@
 {
   TerminalWindowPrivate *priv = window->priv;
   const char *name, *charset;
-  GtkWidget *widget;
   
   if (!gtk_toggle_action_get_active (action))
     return;
@@ -680,7 +666,6 @@
                              gpointer     user_data)
 {
   TerminalWindow *window = (TerminalWindow *) user_data;
-  TerminalWindowPrivate *priv = window->priv;
   GtkClipboard *clipboard;
 
   clipboard = gtk_widget_get_clipboard (GTK_WIDGET (window), GDK_SELECTION_CLIPBOARD);
@@ -825,7 +810,6 @@
 {
   TerminalWindowPrivate *priv = window->priv;
   TerminalScreenPopupInfo *info = priv->popup_info;
-  GdkDisplay *display;
   GtkClipboard *clipboard;
 
   if (info == NULL)
@@ -1234,12 +1218,8 @@
   GtkAction *action;
   GtkUIManager *manager;
   GtkWidget *main_vbox;
-  GtkWidget *mi;
-  GtkWidget *menu;
-  GtkAccelGroup *accel_group;
   GError *error;
 
-
   priv = window->priv = G_TYPE_INSTANCE_GET_PRIVATE (window, TERMINAL_TYPE_WINDOW, TerminalWindowPrivate);
 
   g_signal_connect (G_OBJECT (window), "delete_event",
@@ -1523,7 +1503,6 @@
                         TerminalWindow *window)
 {
   TerminalWindowPrivate *priv = window->priv;
-  GtkWidget *menu_item;
   const char *title;
   
   if (screen == priv->active_term)
@@ -1770,7 +1749,6 @@
                                      int             force_grid_width,
                                      int             force_grid_height)
 {
-  TerminalWindowPrivate *priv = window->priv;
   /* Owen's hack from gnome-terminal */
   GtkWidget *widget;
   GtkWidget *app;
@@ -2161,7 +2139,6 @@
 file_new_window_callback (GtkAction *action,
                           TerminalWindow *window)
 {
-  TerminalWindowPrivate *priv = window->priv;
   TerminalProfile *profile;
 
   profile = g_object_get_data (G_OBJECT (action), PROFILE_DATA_KEY);
@@ -2308,7 +2285,6 @@
                     TerminalWindow *window)
 {
   TerminalWindowPrivate *priv = window->priv;
-  GtkWidget *widget;
 
   if (!priv->active_term)
     return;
@@ -2321,7 +2297,6 @@
                      TerminalWindow *window)
 {
   TerminalWindowPrivate *priv = window->priv;
-  GtkWidget *widget;
 
   if (!priv->active_term)
     return;
@@ -2376,10 +2351,8 @@
 
 static void
 view_fullscreen_toggled_callback (GtkToggleAction *action,
-                                 TerminalWindow *window)
+                                  TerminalWindow *window)
 {
-  TerminalWindowPrivate *priv = window->priv;
-
   g_return_if_fail (GTK_WIDGET_REALIZED (window));
 
   if (gtk_toggle_action_get_active (action))
@@ -2603,7 +2576,6 @@
 detach_tab (TerminalScreen  *screen,
             TerminalWindow  *window)
 {
-  TerminalWindowPrivate *priv = window->priv;
   TerminalProfile *profile;
 
   profile = terminal_screen_get_profile (screen);
@@ -2720,7 +2692,6 @@
 static void
 monitor_profiles_for_is_default_change (TerminalWindow *window)
 {
-  TerminalWindowPrivate *priv = window->priv;
   GList *profiles;
   GList *tmp;
   
@@ -2750,8 +2721,6 @@
 void
 terminal_window_reread_profile_list (TerminalWindow *window)
 {
-  TerminalWindowPrivate *priv = window->priv;
-  
   monitor_profiles_for_is_default_change (window);
   
   terminal_window_update_set_profile_menu (window);