aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
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 /libempathy-gtk
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 'libempathy-gtk')
-rw-r--r--libempathy-gtk/empathy-account-widget.c1
-rw-r--r--libempathy-gtk/empathy-avatar-image.c4
-rw-r--r--libempathy-gtk/empathy-chat.c4
-rw-r--r--libempathy-gtk/empathy-contact-list-store.c3
-rw-r--r--libempathy-gtk/empathy-contact-list-view.c4
-rw-r--r--libempathy-gtk/empathy-individual-store.c3
-rw-r--r--libempathy-gtk/empathy-individual-view.c4
-rw-r--r--libempathy-gtk/empathy-live-search.c24
-rw-r--r--libempathy-gtk/empathy-ui-utils.c1
9 files changed, 39 insertions, 9 deletions
diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
index caabdeb04..66c7e467b 100644
--- a/libempathy-gtk/empathy-account-widget.c
+++ b/libempathy-gtk/empathy-account-widget.c
@@ -600,6 +600,7 @@ accounts_widget_generic_setup (EmpathyAccountWidget *self,
case 't': minint = 0; maxint = G_MAXUINT64; break;
case 'd': minint = G_MININT32; maxint = G_MAXINT32;
step = 0.1; break;
+ default: g_assert_not_reached ();
}
str = g_strdup_printf (_("%s:"), param_name_formatted);
diff --git a/libempathy-gtk/empathy-avatar-image.c b/libempathy-gtk/empathy-avatar-image.c
index 97818554f..cfc73b702 100644
--- a/libempathy-gtk/empathy-avatar-image.c
+++ b/libempathy-gtk/empathy-avatar-image.c
@@ -132,8 +132,7 @@ avatar_image_filter_func (GdkXEvent *gdkxevent,
priv = GET_PRIV (data);
- switch (xevent->type) {
- case PropertyNotify:
+ if (xevent->type == PropertyNotify) {
atom = gdk_x11_get_xatom_by_name ("_NET_CURRENT_DESKTOP");
if (xevent->xproperty.atom == atom) {
if (priv->popup) {
@@ -141,7 +140,6 @@ avatar_image_filter_func (GdkXEvent *gdkxevent,
priv->popup = NULL;
}
}
- break;
}
return GDK_FILTER_CONTINUE;
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 5d8fe71d3..dd140587c 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -255,6 +255,9 @@ reconnected_connection_ready_cb (TpConnection *connection,
empathy_dispatcher_join_muc (connection,
priv->id, EMPATHY_DISPATCHER_NON_USER_ACTION);
break;
+ case TP_HANDLE_TYPE_NONE:
+ case TP_HANDLE_TYPE_LIST:
+ case TP_HANDLE_TYPE_GROUP:
default:
g_assert_not_reached ();
break;
@@ -1166,6 +1169,7 @@ chat_send_error_cb (EmpathyTpChat *tp_chat,
case TP_CHANNEL_TEXT_SEND_ERROR_NOT_IMPLEMENTED:
error = _("not implemented");
break;
+ case TP_CHANNEL_TEXT_SEND_ERROR_UNKNOWN:
default:
error = _("unknown");
break;
diff --git a/libempathy-gtk/empathy-contact-list-store.c b/libempathy-gtk/empathy-contact-list-store.c
index a7a5beca9..d87461eeb 100644
--- a/libempathy-gtk/empathy-contact-list-store.c
+++ b/libempathy-gtk/empathy-contact-list-store.c
@@ -712,6 +712,9 @@ empathy_contact_list_store_set_sort_criterium (EmpathyContactListStore *stor
EMPATHY_CONTACT_LIST_STORE_COL_NAME,
GTK_SORT_ASCENDING);
break;
+
+ default:
+ g_assert_not_reached ();
}
g_object_notify (G_OBJECT (store), "sort-criterium");
diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c
index e0c93e28e..f36718c83 100644
--- a/libempathy-gtk/empathy-contact-list-view.c
+++ b/libempathy-gtk/empathy-contact-list-view.c
@@ -763,11 +763,9 @@ contact_list_view_drag_data_get (GtkWidget *widget,
g_object_unref (contact);
str = g_strconcat (account_id, ":", contact_id, NULL);
- switch (info) {
- case DND_DRAG_TYPE_CONTACT_ID:
+ if (info == DND_DRAG_TYPE_CONTACT_ID) {
gtk_selection_data_set (selection, drag_atoms_source[info], 8,
(guchar *) str, strlen (str) + 1);
- break;
}
g_free (str);
diff --git a/libempathy-gtk/empathy-individual-store.c b/libempathy-gtk/empathy-individual-store.c
index 0a628855c..89cbc062a 100644
--- a/libempathy-gtk/empathy-individual-store.c
+++ b/libempathy-gtk/empathy-individual-store.c
@@ -1651,6 +1651,9 @@ empathy_individual_store_set_sort_criterium (EmpathyIndividualStore *self,
gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (self),
EMPATHY_INDIVIDUAL_STORE_COL_NAME, GTK_SORT_ASCENDING);
break;
+
+ default:
+ g_assert_not_reached ();
}
g_object_notify (G_OBJECT (self), "sort-criterium");
diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c
index 369933e6a..239eda7d0 100644
--- a/libempathy-gtk/empathy-individual-view.c
+++ b/libempathy-gtk/empathy-individual-view.c
@@ -783,12 +783,10 @@ individual_view_drag_data_get (GtkWidget *widget,
individual_id = folks_individual_get_id (individual);
- switch (info)
+ if (info == DND_DRAG_TYPE_INDIVIDUAL_ID)
{
- case DND_DRAG_TYPE_INDIVIDUAL_ID:
gtk_selection_data_set (selection, drag_atoms_source[info], 8,
(guchar *) individual_id, strlen (individual_id) + 1);
- break;
}
g_object_unref (individual);
diff --git a/libempathy-gtk/empathy-live-search.c b/libempathy-gtk/empathy-live-search.c
index 399733ced..41325c34b 100644
--- a/libempathy-gtk/empathy-live-search.c
+++ b/libempathy-gtk/empathy-live-search.c
@@ -89,6 +89,30 @@ stripped_char (gunichar ch)
case G_UNICODE_ENCLOSING_MARK:
/* Ignore those */
break;
+ case G_UNICODE_PRIVATE_USE:
+ case G_UNICODE_SURROGATE:
+ case G_UNICODE_LOWERCASE_LETTER:
+ case G_UNICODE_MODIFIER_LETTER:
+ case G_UNICODE_OTHER_LETTER:
+ case G_UNICODE_TITLECASE_LETTER:
+ case G_UNICODE_UPPERCASE_LETTER:
+ case G_UNICODE_DECIMAL_NUMBER:
+ case G_UNICODE_LETTER_NUMBER:
+ case G_UNICODE_OTHER_NUMBER:
+ case G_UNICODE_CONNECT_PUNCTUATION:
+ case G_UNICODE_DASH_PUNCTUATION:
+ case G_UNICODE_CLOSE_PUNCTUATION:
+ case G_UNICODE_FINAL_PUNCTUATION:
+ case G_UNICODE_INITIAL_PUNCTUATION:
+ case G_UNICODE_OTHER_PUNCTUATION:
+ case G_UNICODE_OPEN_PUNCTUATION:
+ case G_UNICODE_CURRENCY_SYMBOL:
+ case G_UNICODE_MODIFIER_SYMBOL:
+ case G_UNICODE_MATH_SYMBOL:
+ case G_UNICODE_OTHER_SYMBOL:
+ case G_UNICODE_LINE_SEPARATOR:
+ case G_UNICODE_PARAGRAPH_SEPARATOR:
+ case G_UNICODE_SPACE_SEPARATOR:
default:
ch = g_unichar_tolower (ch);
decomp = g_unicode_canonical_decomposition (ch, &dlen);
diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index 9fcdc985e..703d3e37c 100644
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -206,6 +206,7 @@ empathy_icon_name_for_presence (TpConnectionPresenceType presence)
case TP_CONNECTION_PRESENCE_TYPE_UNKNOWN:
return EMPATHY_IMAGE_PENDING;
case TP_CONNECTION_PRESENCE_TYPE_UNSET:
+ default:
return NULL;
}