GNOME.org
 

[gnome-terminal] Fix some compiler warnings

commit 47eec6fa6ac10d22a9836f454671d8ea4a2cf5eb
Author: Christian Persch <chpe gnome org>
Date:   Thu Jun 25 17:54:38 2009 +0200

    Fix some compiler warnings

 src/eggdesktopfile.c            |    2 ++
 src/eggsmclient-xsmp.c          |   12 ++++++------
 src/skey/skey.c                 |    3 +--
 src/terminal-accels.c           |    2 +-
 src/terminal-app.c              |    8 ++++----
 src/terminal-options.c          |    3 +--
 src/terminal-profile.c          |   10 ++++------
 src/terminal-screen-container.c |    4 ++++
 src/terminal-screen.c           |    7 +++----
 src/terminal-tab-label.c        |    9 ++++++---
 src/terminal-tabs-menu.c        |    7 ++++---
 src/terminal-util.c             |   30 ++++++++++++++++--------------
 src/terminal-window.c           |    8 +++-----
 src/terminal.c                  |   22 +++++++++++-----------
 14 files changed, 66 insertions(+), 61 deletions(-)
---
diff --git a/src/eggdesktopfile.c b/src/eggdesktopfile.c
index c185998..ab0571f 100644
--- a/src/eggdesktopfile.c
+++ b/src/eggdesktopfile.c
@@ -1386,6 +1386,8 @@ egg_desktop_file_launch (EggDesktopFile *desktop_file,
       free_document_list (documents);
       break;
 
+    case EGG_DESKTOP_FILE_TYPE_UNRECOGNIZED:
+    case EGG_DESKTOP_FILE_TYPE_DIRECTORY:
     default:
       g_set_error (error, EGG_DESKTOP_FILE_ERROR,
 		   EGG_DESKTOP_FILE_ERROR_NOT_LAUNCHABLE,
diff --git a/src/eggsmclient-xsmp.c b/src/eggsmclient-xsmp.c
index 81af7d2..69f96f8 100644
--- a/src/eggsmclient-xsmp.c
+++ b/src/eggsmclient-xsmp.c
@@ -1087,13 +1087,13 @@ generate_command (char **argv, const char *client_id,
 
   if (client_id)
     {
-      g_ptr_array_add (cmd, "--sm-client-id");
+      g_ptr_array_add (cmd, (char *)"--sm-client-id");
       g_ptr_array_add (cmd, (char *)client_id);
     }
 
   if (state_file)
     {
-      g_ptr_array_add (cmd, "--sm-client-state-file");
+      g_ptr_array_add (cmd, (char *)"--sm-client-state-file");
       g_ptr_array_add (cmd, (char *)state_file);
     }
 
@@ -1176,7 +1176,7 @@ array_prop (const char *name, ...)
 
   prop = g_new (SmProp, 1);
   prop->name = (char *)name;
-  prop->type = SmLISTofARRAY8;
+  prop->type = (char *)SmLISTofARRAY8;
 
   vals = g_array_new (FALSE, FALSE, sizeof (SmPropValue));
 
@@ -1210,7 +1210,7 @@ ptrarray_prop (const char *name, GPtrArray *values)
 
   prop = g_new (SmProp, 1);
   prop->name = (char *)name;
-  prop->type = SmLISTofARRAY8;
+  prop->type = (char *)SmLISTofARRAY8;
 
   vals = g_array_new (FALSE, FALSE, sizeof (SmPropValue));
 
@@ -1240,7 +1240,7 @@ string_prop (const char *name, const char *value)
 
   prop = g_new (SmProp, 1);
   prop->name = (char *)name;
-  prop->type = SmARRAY8;
+  prop->type = (char *)SmARRAY8;
 
   prop->num_vals = 1;
   prop->vals = g_new (SmPropValue, 1);
@@ -1265,7 +1265,7 @@ card8_prop (const char *name, unsigned char value)
 
   prop = g_new (SmProp, 1);
   prop->name = (char *)name;
-  prop->type = SmCARD8;
+  prop->type = (char *)SmCARD8;
 
   prop->num_vals = 1;
   prop->vals = g_new (SmPropValue, 2);
diff --git a/src/skey/skey.c b/src/skey/skey.c
index 1957bb9..2517842 100644
--- a/src/skey/skey.c
+++ b/src/skey/skey.c
@@ -26,8 +26,7 @@ char *skey(SKeyAlgorithm algorithm, int seq, const char *seed, const char *passp
 {
 	char key[SKEY_SIZE];
 	int i;
-	g_assert(algorithm >= MD4);
-	g_assert(algorithm <= SHA1);
+        g_assert (algorithm < G_N_ELEMENTS (hash_table));
 	if (hash_table[algorithm].Keycrunch(key, seed, passphrase) == -1)
 		return NULL;
 
diff --git a/src/terminal-accels.c b/src/terminal-accels.c
index 6c3e0fb..586bf79 100644
--- a/src/terminal-accels.c
+++ b/src/terminal-accels.c
@@ -111,7 +111,7 @@ typedef struct
 {
   KeyEntry *key_entry;
   guint n_elements;
-  gchar *user_visible_name;
+  const char *user_visible_name;
 } KeyEntryList;
 
 static KeyEntry file_entries[] =
diff --git a/src/terminal-app.c b/src/terminal-app.c
index d7336a0..bcc7bbc 100644
--- a/src/terminal-app.c
+++ b/src/terminal-app.c
@@ -1669,10 +1669,10 @@ terminal_app_handle_options (TerminalApp *app,
                              GError **error)
 {
   GList *lw;
-  GdkScreen *screen;
+  GdkScreen *gdk_screen;
 
-  screen = terminal_app_get_screen_by_display_name (options->display_name,
-                                                    options->screen_number);
+  gdk_screen = terminal_app_get_screen_by_display_name (options->display_name,
+                                                        options->screen_number);
 
   if (options->save_config)
     return terminal_app_save_config_file (app, options->config_file, error);
@@ -1723,7 +1723,7 @@ terminal_app_handle_options (TerminalApp *app,
       g_assert (iw->tabs);
 
       /* Create & setup new window */
-      window = terminal_app_new_window (app, screen);
+      window = terminal_app_new_window (app, gdk_screen);
 
       if (options->startup_id)
         terminal_window_set_startup_id (window, options->startup_id);
diff --git a/src/terminal-options.c b/src/terminal-options.c
index 4971b7d..7522ce5 100644
--- a/src/terminal-options.c
+++ b/src/terminal-options.c
@@ -178,7 +178,7 @@ unsupported_option_callback (const gchar *option_name,
 }
 
 
-static gboolean
+static gboolean G_GNUC_NORETURN
 option_version_cb (const gchar *option_name,
                    const gchar *value,
                    gpointer     data,
@@ -187,7 +187,6 @@ option_version_cb (const gchar *option_name,
   g_print ("%s %s\n", _("GNOME Terminal"), VERSION);
 
   exit (EXIT_SUCCESS);
-  return FALSE;
 }
 
 static gboolean
diff --git a/src/terminal-profile.c b/src/terminal-profile.c
index da87281..d5b874b 100644
--- a/src/terminal-profile.c
+++ b/src/terminal-profile.c
@@ -272,8 +272,6 @@ enum
   LAST_SIGNAL
 };
 
-static void terminal_profile_init        (TerminalProfile      *profile);
-static void terminal_profile_class_init  (TerminalProfileClass *klass);
 static void terminal_profile_finalize    (GObject              *object);
 static void terminal_profile_set_property (GObject *object,
                                            guint prop_id,
@@ -335,7 +333,7 @@ get_prop_value_from_prop_name (TerminalProfile *profile,
 }
 
 static void
-set_value_from_palette (GValue *value,
+set_value_from_palette (GValue *ret_value,
                         const GdkColor *colors,
                         guint n_colors)
 {
@@ -364,7 +362,7 @@ set_value_from_palette (GValue *value,
       g_value_set_boxed (value, &DEFAULT_PALETTE[i]);
     }
 
-  g_value_take_boxed (value, array);
+  g_value_take_boxed (ret_value, array);
 }
 
 static int
@@ -1211,8 +1209,8 @@ terminal_profile_class_init (TerminalProfileClass *klass)
 \
   if (propGConf)\
     {\
-      g_param_spec_set_qdata (pspec, gconf_key_quark, propGConf);\
-      g_hash_table_insert (klass->gconf_keys, propGConf, pspec);\
+      g_param_spec_set_qdata (pspec, gconf_key_quark, (gpointer) propGConf);\
+      g_hash_table_insert (klass->gconf_keys, (gpointer) propGConf, pspec);\
     }\
 }
 
diff --git a/src/terminal-screen-container.c b/src/terminal-screen-container.c
index 60405eb..455dcba 100644
--- a/src/terminal-screen-container.c
+++ b/src/terminal-screen-container.c
@@ -111,6 +111,8 @@ terminal_screen_container_set_policy (GtkWidget *container,
     case GTK_POLICY_ALWAYS:
       gtk_widget_show (scrollbar);
       break;
+    default:
+      g_assert_not_reached ();
   }
 #endif
 }
@@ -138,6 +140,8 @@ terminal_screen_container_set_placement (GtkWidget *container,
     case GTK_CORNER_BOTTOM_RIGHT:
       gtk_box_reorder_child (GTK_BOX (container), scrollbar, 0);
       break;
+    default:
+      g_assert_not_reached ();
   }
 #endif
 }
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
index 9fa401f..1aa0c05 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -104,8 +104,6 @@ enum
   TARGET_TAB
 };
 
-static void terminal_screen_init        (TerminalScreen      *screen);
-static void terminal_screen_class_init  (TerminalScreenClass *klass);
 static void terminal_screen_dispose     (GObject             *object);
 static void terminal_screen_finalize    (GObject             *object);
 static void terminal_screen_drag_data_received (GtkWidget        *widget,
@@ -1915,6 +1913,7 @@ terminal_screen_child_exited (VteTerminal *terminal)
       terminal_screen_launch_child (screen);
       break;
     case TERMINAL_EXIT_HOLD:
+    default:
       break;
     }
 }
@@ -1944,7 +1943,7 @@ terminal_screen_drag_data_received (GtkWidget        *widget,
                                     gint              y,
                                     GtkSelectionData *selection_data,
                                     guint             info,
-                                    guint             time)
+                                    guint             timestamp)
 {
   TerminalScreen *screen = TERMINAL_SCREEN (widget);
   TerminalScreenPrivate *priv = screen->priv;
@@ -2151,7 +2150,7 @@ terminal_screen_drag_data_received (GtkWidget        *widget,
                                           GTK_WIDGET (screen));
         terminal_window_move_screen (source_window, dest_window, moving_screen, page_num + 1);
 
-        gtk_drag_finish (context, TRUE, TRUE, time);
+        gtk_drag_finish (context, TRUE, TRUE, timestamp);
       }
       break;
 
diff --git a/src/terminal-tab-label.c b/src/terminal-tab-label.c
index 91509be..88eb916 100644
--- a/src/terminal-tab-label.c
+++ b/src/terminal-tab-label.c
@@ -176,9 +176,9 @@ terminal_tab_label_finalize (GObject *object)
 
 static void
 terminal_tab_label_set_property (GObject *object,
-                           guint prop_id,
-                           const GValue *value,
-                           GParamSpec *pspec)
+                                 guint prop_id,
+                                 const GValue *value,
+                                 GParamSpec *pspec)
 {
   TerminalTabLabel *tab_label = TERMINAL_TAB_LABEL (object);
   TerminalTabLabelPrivate *priv = tab_label->priv;
@@ -187,6 +187,9 @@ terminal_tab_label_set_property (GObject *object,
     case PROP_SCREEN:
       priv->screen = g_value_get_object (value);
       break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
   }
 }
 
diff --git a/src/terminal-tabs-menu.c b/src/terminal-tabs-menu.c
index c1e60de..d003a1f 100644
--- a/src/terminal-tabs-menu.c
+++ b/src/terminal-tabs-menu.c
@@ -60,8 +60,6 @@ enum
 	PROP_WINDOW
 };
 
-static void	terminal_tabs_menu_class_init	(TerminalTabsMenuClass *klass);
-static void	terminal_tabs_menu_init	  	(TerminalTabsMenu *menu);
 static void	terminal_tabs_menu_update		(TerminalTabsMenu *menu);
 
 /* FIXME: this can be severely optimised */
@@ -130,7 +128,7 @@ free_tab_id (GtkAction *action)
         name = gtk_action_get_name (action);
         id = g_ascii_strtoull (name + ACTION_VERB_FORMAT_PREFIX_LEN, NULL,
                                ACTION_VERB_FORMAT_BASE);
-        g_assert (id >= 0 && id < tabs_id_array->len * 8);
+        g_assert (id < tabs_id_array->len * 8);
 
         b = id >> 3;
         bit = id & 0x7;
@@ -350,6 +348,9 @@ terminal_tabs_menu_set_property (GObject *object,
 		case PROP_WINDOW:
 			terminal_tabs_menu_set_window (menu, g_value_get_object (value));
 			break;
+                default:
+                        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+                        break;
 	}
 }
 
diff --git a/src/terminal-util.c b/src/terminal-util.c
index cd5f675..a8103ce 100644
--- a/src/terminal-util.c
+++ b/src/terminal-util.c
@@ -234,6 +234,8 @@ terminal_util_open_url (GtkWidget *parent,
     case FLAVOR_AS_IS:
       uri = g_strdup (orig_url);
       break;
+    case FLAVOR_SKEY:
+      /* shouldn't get this */
     default:
       uri = NULL;
       g_assert_not_reached ();
@@ -833,8 +835,8 @@ terminal_util_bind_object_property_to_widget (GObject *object,
                                               PropertyChangeFlags flags)
 {
   PropertyChange *change;
-  const char *signal;
-  char notify_signal[64];
+  const char *signal_name;
+  char notify_signal_name[64];
 
   change = g_slice_new0 (PropertyChange);
 
@@ -843,35 +845,35 @@ terminal_util_bind_object_property_to_widget (GObject *object,
   g_object_set_data_full (G_OBJECT (widget), "GT:PCD", change, (GDestroyNotify) property_change_free);
 
   if (GTK_IS_TOGGLE_BUTTON (widget))
-    signal = "notify::active";
+    signal_name = "notify::active";
   else if (GTK_IS_SPIN_BUTTON (widget))
-    signal = "notify::value";
+    signal_name = "notify::value";
   else if (GTK_IS_ENTRY (widget))
-    signal = "notify::text";
+    signal_name = "notify::text";
   else if (GTK_IS_COMBO_BOX (widget))
-    signal = "notify::active";
+    signal_name = "notify::active";
   else if (GTK_IS_COLOR_BUTTON (widget))
-    signal = "notify::color";
+    signal_name = "notify::color";
   else if (GTK_IS_FONT_BUTTON (widget))
-    signal = "notify::font-name";
+    signal_name = "notify::font-name";
   else if (GTK_IS_RANGE (widget))
-    signal = "value-changed";
+    signal_name = "value-changed";
   else if (GTK_IS_FILE_CHOOSER_BUTTON (widget))
-    signal = "file-set";
+    signal_name = "file-set";
   else if (GTK_IS_FILE_CHOOSER (widget))
-    signal = "selection-changed";
+    signal_name = "selection-changed";
   else
     g_assert_not_reached ();
 
-  change->widget_notify_id = g_signal_connect_swapped (widget, signal, G_CALLBACK (widget_change_notify_cb), change);
+  change->widget_notify_id = g_signal_connect_swapped (widget, signal_name, G_CALLBACK (widget_change_notify_cb), change);
 
   change->object = object;
   change->flags = flags;
   change->object_prop = object_prop;
 
-  g_snprintf (notify_signal, sizeof (notify_signal), "notify::%s", object_prop);
+  g_snprintf (notify_signal_name, sizeof (notify_signal_name), "notify::%s", object_prop);
   object_change_notify_cb (change);
-  change->object_notify_id = g_signal_connect_swapped (object, notify_signal, G_CALLBACK (object_change_notify_cb), change);
+  change->object_notify_id = g_signal_connect_swapped (object, notify_signal_name, G_CALLBACK (object_change_notify_cb), change);
 }
 
 #ifdef GDK_WINDOWING_X11
diff --git a/src/terminal-window.c b/src/terminal-window.c
index e135ab2..d2f5c41 100644
--- a/src/terminal-window.c
+++ b/src/terminal-window.c
@@ -105,8 +105,6 @@ struct _TerminalWindowPrivate
 #define STOCK_NEW_WINDOW  "window-new"
 #define STOCK_NEW_TAB     "tab-new"
 
-static void terminal_window_init        (TerminalWindow      *window);
-static void terminal_window_class_init  (TerminalWindowClass *klass);
 static void terminal_window_dispose     (GObject             *object);
 static void terminal_window_finalize    (GObject             *object);
 static gboolean terminal_window_state_event (GtkWidget            *widget,
@@ -3010,10 +3008,10 @@ confirm_close_window_or_tab (TerminalWindow *window,
 
       for (t = tabs; t != NULL; t = t->next)
         {
-          TerminalScreen *screen;
+          TerminalScreen *terminal_screen;
 
-          screen = terminal_screen_container_get_screen ((GtkWidget *) t->data);
-          if (terminal_screen_has_foreground_process (screen))
+          terminal_screen = terminal_screen_container_get_screen ((GtkWidget *) t->data);
+          if (terminal_screen_has_foreground_process (terminal_screen))
             {
               do_confirm = TRUE;
               break;
diff --git a/src/terminal.c b/src/terminal.c
index 49a8651..c27abe1 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -87,6 +87,13 @@ terminal_factory_handle_arguments (TerminalFactory *factory,
 #include "terminal-factory-client.h"
 #include "terminal-factory-server.h"
 
+static GType terminal_factory_get_type (void);
+
+G_DEFINE_TYPE_WITH_CODE (TerminalFactory, terminal_factory, G_TYPE_OBJECT,
+  dbus_g_object_type_install_info (g_define_type_id,
+                                   &dbus_glib_terminal_factory_object_info)
+);
+ 
 static void
 terminal_factory_class_init (TerminalFactoryClass *factory_class)
 {
@@ -97,13 +104,6 @@ terminal_factory_init (TerminalFactory *factory)
 {
 }
 
-static GType terminal_factory_get_type (void);
-
-G_DEFINE_TYPE_WITH_CODE (TerminalFactory, terminal_factory, G_TYPE_OBJECT,
-  dbus_g_object_type_install_info (g_define_type_id,
-                                   &dbus_glib_terminal_factory_object_info)
-);
- 
 /* Settings storage works as follows:
  *   /apps/gnome-terminal/global/
  *   /apps/gnome-terminal/profiles/Foo/
@@ -181,13 +181,13 @@ slowly_and_stupidly_obtain_timestamp (Display *xdisplay)
 
 static void
 about_url_hook (GtkAboutDialog *about,
-	        const char *link,
+	        const char *uri,
 	        gpointer user_data)
 {
   GError *error = NULL;
 
   if (!gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (about)),
-                      link,
+                      uri,
                       gtk_get_current_event_time (),
                       &error))
     {
@@ -364,7 +364,7 @@ main (int argc, char **argv)
       char **env;
       const char *evalue;
       GPtrArray *env_ptr_array;
-      int i, envc;
+      int envc;
       GArray *working_directory_array, *display_name_array, *startup_id_array;
       GArray *env_array, *argv_array;
       gboolean retval;
@@ -507,7 +507,7 @@ handle_new_terminal_event (TerminalOptions *options)
 }
 
 static gboolean
-terminal_factory_handle_arguments (TerminalFactory *factory,
+terminal_factory_handle_arguments (TerminalFactory *terminal_factory,
                                    const GArray *working_directory_array,
                                    const GArray *display_name_array,
                                    const GArray *startup_id_array,
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]