aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPhilip Withnall <philip.withnall@collabora.co.uk>2010-07-08 18:39:07 +0800
committerPhilip Withnall <philip.withnall@collabora.co.uk>2010-08-05 22:55:07 +0800
commitf8c37da731af9f6cd74e7a0ef08fa02059d981ac (patch)
tree88678c98422ba129ac0b6f602c5832bc9570251b /src
parent5cc326f741ab695e4fac8f4c4ccd99cf235115fc (diff)
downloadgsoc2013-empathy-f8c37da731af9f6cd74e7a0ef08fa02059d981ac.tar
gsoc2013-empathy-f8c37da731af9f6cd74e7a0ef08fa02059d981ac.tar.gz
gsoc2013-empathy-f8c37da731af9f6cd74e7a0ef08fa02059d981ac.tar.bz2
gsoc2013-empathy-f8c37da731af9f6cd74e7a0ef08fa02059d981ac.tar.lz
gsoc2013-empathy-f8c37da731af9f6cd74e7a0ef08fa02059d981ac.tar.xz
gsoc2013-empathy-f8c37da731af9f6cd74e7a0ef08fa02059d981ac.tar.zst
gsoc2013-empathy-f8c37da731af9f6cd74e7a0ef08fa02059d981ac.zip
Fix missing entries in switch statements
Added missing default cases and missing enum cases.
Diffstat (limited to 'src')
-rw-r--r--src/empathy-account-assistant.c14
-rw-r--r--src/empathy-call-window.c29
-rw-r--r--src/empathy-ft-manager.c2
-rw-r--r--src/empathy-main-window.c3
4 files changed, 39 insertions, 9 deletions
diff --git a/src/empathy-account-assistant.c b/src/empathy-account-assistant.c
index 6ad475652..585916903 100644
--- a/src/empathy-account-assistant.c
+++ b/src/empathy-account-assistant.c
@@ -57,12 +57,12 @@ typedef enum {
RESPONSE_CREATE_STOP = 2
} CreateEnterPageResponse;
-enum {
+typedef enum {
PAGE_INTRO = 0,
PAGE_IMPORT = 1,
PAGE_ENTER_CREATE = 2,
PAGE_SALUT = 3,
-};
+} PageID;
enum {
PROP_PARENT = 1,
@@ -75,7 +75,7 @@ typedef struct {
gboolean enter_create_forward;
TpAccountManager *account_mgr;
EmpathyConnectionManagers *connection_mgrs;
- gint current_page_id;
+ PageID current_page_id;
/* enter or create page */
GtkWidget *enter_or_create_page;
@@ -933,12 +933,8 @@ impl_signal_prepare (GtkAssistant *assistant,
gint current_idx;
/* check from which page we are coming from */
- switch (priv->current_page_id)
- {
- case PAGE_IMPORT:
- empathy_import_widget_add_selected_accounts (priv->iw);
- break;
- }
+ if (priv->current_page_id == PAGE_IMPORT)
+ empathy_import_widget_add_selected_accounts (priv->iw);
current_idx = gtk_assistant_get_current_page (assistant);
priv->current_page_id = current_idx;
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index d64d59302..c2416ea03 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -2377,6 +2377,10 @@ media_stream_error_to_txt (EmpathyCallWindow *self,
case TP_MEDIA_STREAM_ERROR_MEDIA_ERROR:
return g_strdup (_("There was a failure in the call engine"));
+ case TP_MEDIA_STREAM_ERROR_EOS:
+ return g_strdup (_("The end of the stream was reached"));
+
+ case TP_MEDIA_STREAM_ERROR_UNKNOWN:
default:
return NULL;
}
@@ -2737,6 +2741,31 @@ empathy_call_window_bus_message (GstBus *bus, GstMessage *message,
g_error_free (error);
g_free (debug);
}
+ case GST_MESSAGE_UNKNOWN:
+ case GST_MESSAGE_EOS:
+ case GST_MESSAGE_WARNING:
+ case GST_MESSAGE_INFO:
+ case GST_MESSAGE_TAG:
+ case GST_MESSAGE_BUFFERING:
+ case GST_MESSAGE_STATE_DIRTY:
+ case GST_MESSAGE_STEP_DONE:
+ case GST_MESSAGE_CLOCK_PROVIDE:
+ case GST_MESSAGE_CLOCK_LOST:
+ case GST_MESSAGE_NEW_CLOCK:
+ case GST_MESSAGE_STRUCTURE_CHANGE:
+ case GST_MESSAGE_STREAM_STATUS:
+ case GST_MESSAGE_APPLICATION:
+ case GST_MESSAGE_ELEMENT:
+ case GST_MESSAGE_SEGMENT_START:
+ case GST_MESSAGE_SEGMENT_DONE:
+ case GST_MESSAGE_DURATION:
+ case GST_MESSAGE_LATENCY:
+ case GST_MESSAGE_ASYNC_START:
+ case GST_MESSAGE_ASYNC_DONE:
+ case GST_MESSAGE_REQUEST_STATE:
+ case GST_MESSAGE_STEP_START:
+ case GST_MESSAGE_QOS:
+ case GST_MESSAGE_ANY:
default:
break;
}
diff --git a/src/empathy-ft-manager.c b/src/empathy-ft-manager.c
index 58edc584e..14f67e51a 100644
--- a/src/empathy-ft-manager.c
+++ b/src/empathy-ft-manager.c
@@ -881,6 +881,8 @@ ft_manager_response_cb (GtkWidget *widget,
case RESPONSE_STOP:
ft_manager_stop (manager);
break;
+ default:
+ g_assert_not_reached ();
}
}
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index 4aa38f5f4..73d84ab44 100644
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -1017,6 +1017,9 @@ account_status_changed_cb (TpAccount *account,
case TP_CONNECTION_STATUS_CONNECTED:
/* We can join the room */
break;
+
+ default:
+ g_assert_not_reached ();
}
join_chatroom (ctx->chatroom, ctx->timestamp);